Autogenerated HTML docs for v2.3.4-263-gf53fc
diff --git a/RelNotes/2.3.4.txt b/RelNotes/2.3.4.txt new file mode 100644 index 0000000..094c7b8 --- /dev/null +++ b/RelNotes/2.3.4.txt
@@ -0,0 +1,32 @@ +Git v2.3.4 Release Notes +======================== + +Fixes since v2.3.3 +------------------ + + * The 'color.status.unmerged' configuration was not described. + + * "git log --decorate" did not reset colors correctly around the + branch names. + + * "git -C '' subcmd" refused to work in the current directory, unlike + "cd ''" which silently behaves as a no-op. + + * "git imap-send" learned to optionally talk with an IMAP server via + libcURL; because there is no other option when Git is built with + NO_OPENSSL option, use that codepath by default under such + configuration. + + * A workaround for certain build of GPG that triggered false breakage + in a test has been added. + + * "git rebase -i" recently started to include the number of + commits in the insn sheet to be processed, but on a platform + that prepends leading whitespaces to "wc -l" output, the numbers + are shown with extra whitespaces that aren't necessary. + + * We did not parse username followed by literal IPv6 address in SSH + transport URLs, e.g. ssh://user@[2001:db8::1]:22/repo.git + correctly. + +Also contains typofixes, documentation updates and trivial code clean-ups.
diff --git a/RelNotes/2.4.0.txt b/RelNotes/2.4.0.txt index ca149da..f052162 100644 --- a/RelNotes/2.4.0.txt +++ b/RelNotes/2.4.0.txt
@@ -4,24 +4,36 @@ Backward compatibility warning(s) --------------------------------- -Output from "git log --decorate" (and "%d" format specifier used in -the userformat "--format=<string>" parameter "git log" family of -command takes) used to list "HEAD" just like other tips of branch -names, separated with a comma in between. E.g. +This release has a few changes in the user-visible output from +Porcelain commands, which the users may want to be aware of. - $ git log --decorate -1 master - commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD, master) - ... + * Output from "git log --decorate" (and "%d" format specifier used in + the userformat "--format=<string>" parameter "git log" family of + command takes) used to list "HEAD" just like other tips of branch + names, separated with a comma in between. E.g. -This release updates the output slightly when HEAD refers to the tip -of a branch whose name is also shown in the output. The above is -shown as: + $ git log --decorate -1 master + commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD, master) + ... - $ git log --decorate -1 master - commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD -> master) - ... + This release updates the output slightly when HEAD refers to the tip + of a branch whose name is also shown in the output. The above is + shown as: + $ git log --decorate -1 master + commit bdb0f6788fa5e3cacc4315e9ff318a27b2676ff4 (HEAD -> master) + ... + * The phrasing "git branch" uses to describe a detached HEAD has been + updated to match that of "git status": + + - When the HEAD is at the same commit as it was originally + detached, they now both show "detached at <commit object name>". + + - When the HEAD has moved since it was originally detached, + they now both show "detached from <commit object name>". + + Earlier "git branch" always used "from" Updates since v2.3 @@ -91,7 +103,6 @@ actually at xyz and haven't been moved since it was detached in such a case, but the user cannot read what the current value of HEAD is when "detached from" is used. - (merge 4b06318 mg/detached-head-report later to maint). * "git -C '' subcmd" refused to work in the current directory, unlike "cd ''" which silently behaves as a no-op. @@ -100,6 +111,9 @@ * The versionsort.prerelease configuration variable can be used to specify that v1.0-pre1 comes before v1.0. + * A new "push.followTags" configuration turns the "--follow-tags" + option on by default for the "git push" command. + Performance, Internal Implementation, Development Support etc. @@ -151,6 +165,9 @@ * Code in "git daemon" to parse out and hold hostnames used in request interpolation has been simplified. + * "git push" codepath has been restructured to make it easier to add + new configuration bits. + Also contains various documentation updates and code clean-ups. @@ -370,7 +387,20 @@ branch names. (merge 5ee8758 jc/decorate-leaky-separator-color later to maint). - * Code cleanups and documentaiton updates. + * The code that reads from the ctags file in the completion script + (in contrib/) did not spell ${param/pattern/string} substitution + correctly, which happened to work with bash but not with zsh. + (merge db8d750 js/completion-ctags-pattern-substitution-fix later to maint). + + * The transfer.hiderefs support did not quite work for smart-http + transport. + (merge 8ddf3ca jk/smart-http-hide-refs later to maint). + + * "git tag -h" used to show the "--column" and "--sort" options + that are about listing in a wrong section. + (merge dd059c6 jk/tag-h-column-is-a-listing-option later to maint). + + * Code cleanups and documentation updates. (merge 2ce63e9 rs/simple-cleanups later to maint). (merge 33baa69 rj/no-xopen-source-for-cygwin later to maint). (merge 817d03e jc/diff-test-updates later to maint). @@ -381,3 +411,4 @@ (merge 8fa7975 ak/git-done-help-cleanup later to maint). (merge 9a6f128 rs/deflate-init-cleanup later to maint). (merge 6f75d45 rs/use-isxdigit later to maint). + (merge 376e4b3 jk/test-annoyances later to maint). diff --git a/blame-options.txt b/blame-options.txt index 0cebc4f..b299b59 100644 --- a/blame-options.txt +++ b/blame-options.txt
@@ -4,7 +4,7 @@ --root:: Do not treat root commits as boundaries. This can also be - controlled via the `blame.showroot` config option. + controlled via the `blame.showRoot` config option. --show-stats:: Include additional statistics at the end of blame output.
diff --git a/config.txt b/config.txt index 5666d27..2e5ceaf 100644 --- a/config.txt +++ b/config.txt
@@ -269,7 +269,7 @@ + The default is true (when core.filemode is not specified in the config file). -core.ignorecase:: +core.ignoreCase:: If true, this option enables various workarounds to enable Git to work better on filesystems that are not case sensitive, like FAT. For example, if a directory listing finds @@ -278,12 +278,12 @@ "Makefile". + The default is false, except linkgit:git-clone[1] or linkgit:git-init[1] -will probe and set core.ignorecase true if appropriate when the repository +will probe and set core.ignoreCase true if appropriate when the repository is created. -core.precomposeunicode:: +core.precomposeUnicode:: This option is only used by Mac OS implementation of Git. - When core.precomposeunicode=true, Git reverts the unicode decomposition + When core.precomposeUnicode=true, Git reverts the unicode decomposition of filenames done by Mac OS. This is useful when sharing a repository between Mac OS and Linux or Windows. (Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7). @@ -308,13 +308,13 @@ crawlers and some backup systems). See linkgit:git-update-index[1]. True by default. -core.checkstat:: +core.checkStat:: Determines which stat fields to match between the index and work tree. The user can set this to 'default' or 'minimal'. Default (or explicitly 'default'), is to check all fields, including the sub-second part of mtime and ctime. -core.quotepath:: +core.quotePath:: The commands that output paths (e.g. 'ls-files', 'diff'), when not given the `-z` option, will quote "unusual" characters in the pathname by enclosing the @@ -518,9 +518,9 @@ -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If set, this provides a default to other compression variables, - such as 'core.loosecompression' and 'pack.compression'. + such as 'core.looseCompression' and 'pack.compression'. -core.loosecompression:: +core.looseCompression:: An integer -1..9, indicating the compression level for objects that are not in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being @@ -581,7 +581,7 @@ + Common unit suffixes of 'k', 'm', or 'g' are supported. -core.excludesfile:: +core.excludesFile:: In addition to '.gitignore' (per-directory) and '.git/info/exclude', Git looks into this file for patterns of files which are not meant to be tracked. "`~/`" is expanded @@ -590,7 +590,7 @@ If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore is used instead. See linkgit:gitignore[5]. -core.askpass:: +core.askPass:: Some commands (e.g. svn and http interfaces) that interactively ask for a password can be told to use an external program given via the value of this variable. Can be overridden by the 'GIT_ASKPASS' @@ -599,11 +599,11 @@ prompt. The external program shall be given a suitable prompt as command-line argument and write the password on its STDOUT. -core.attributesfile:: +core.attributesFile:: In addition to '.gitattributes' (per-directory) and '.git/info/attributes', Git looks into this file for attributes (see linkgit:gitattributes[5]). Path expansions are made the same - way as for `core.excludesfile`. Its default value is + way as for `core.excludesFile`. Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/attributes is used instead. @@ -613,7 +613,7 @@ variable when it is set, and the environment variable `GIT_EDITOR` is not set. See linkgit:git-var[1]. -core.commentchar:: +core.commentChar:: Commands such as `commit` and `tag` that lets you edit messages consider a line that begins with this character commented, and removes them after the editor returns @@ -682,7 +682,7 @@ is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent` errors. The default tab width is 8. Allowed values are 1 to 63. -core.fsyncobjectfiles:: +core.fsyncObjectFiles:: This boolean will enable 'fsync()' when writing object files. + This is a total waste of time and effort on a filesystem that orders @@ -690,7 +690,7 @@ journalling (traditional UNIX filesystems) or that only journal metadata and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback"). -core.preloadindex:: +core.preloadIndex:: Enable parallel index preload for operations like 'git diff' + This can speed up operations like 'git diff' and 'git status' especially @@ -761,7 +761,7 @@ by giving '--no-keep-cr' from the command line. See linkgit:git-am[1], linkgit:git-mailsplit[1]. -apply.ignorewhitespace:: +apply.ignoreWhitespace:: When set to 'change', tells 'git apply' to ignore changes in whitespace, in the same way as the '--ignore-space-change' option. @@ -773,7 +773,7 @@ Tells 'git apply' how to handle whitespaces, in the same way as the '--whitespace' option. See linkgit:git-apply[1]. -branch.autosetupmerge:: +branch.autoSetupMerge:: Tells 'git branch' and 'git checkout' to set up new branches so that linkgit:git-pull[1] will appropriately merge from the starting point branch. Note that even if this option is not set, @@ -785,7 +785,7 @@ local branch or remote-tracking branch. This option defaults to true. -branch.autosetuprebase:: +branch.autoSetupRebase:: When a new branch is created with 'git branch' or 'git checkout' that tracks another branch, this variable tells Git to set up pull to rebase instead of merge (see "branch.<name>.rebase"). @@ -796,27 +796,27 @@ remote-tracking branches. When `always`, rebase will be set to true for all tracking branches. - See "branch.autosetupmerge" for details on how to set up a + See "branch.autoSetupMerge" for details on how to set up a branch to track another branch. This option defaults to never. branch.<name>.remote:: When on branch <name>, it tells 'git fetch' and 'git push' which remote to fetch from/push to. The remote to push to - may be overridden with `remote.pushdefault` (for all branches). + may be overridden with `remote.pushDefault` (for all branches). The remote to push to, for the current branch, may be further - overridden by `branch.<name>.pushremote`. If no remote is + overridden by `branch.<name>.pushRemote`. If no remote is configured, or if you are not on any branch, it defaults to - `origin` for fetching and `remote.pushdefault` for pushing. + `origin` for fetching and `remote.pushDefault` for pushing. Additionally, `.` (a period) is the current local repository (a dot-repository), see `branch.<name>.merge`'s final note below. -branch.<name>.pushremote:: +branch.<name>.pushRemote:: When on branch <name>, it overrides `branch.<name>.remote` for - pushing. It also overrides `remote.pushdefault` for pushing + pushing. It also overrides `remote.pushDefault` for pushing from branch <name>. When you pull from one place (e.g. your upstream) and push to another place (e.g. your own publishing - repository), you would want to set `remote.pushdefault` to + repository), you would want to set `remote.pushDefault` to specify the remote to push to for all branches, and use this option to override it for a specific branch. @@ -838,7 +838,7 @@ branch.<name>.merge to the desired branch, and use the relative path setting `.` (a period) for branch.<name>.remote. -branch.<name>.mergeoptions:: +branch.<name>.mergeOptions:: Sets default options for merging into branch <name>. The syntax and supported options are the same as those of linkgit:git-merge[1], but option values containing whitespace characters are currently not @@ -964,7 +964,7 @@ A boolean to enable/disable colored output when the pager is in use (default is true). -color.showbranch:: +color.showBranch:: A boolean to enable/disable color in the output of linkgit:git-show-branch[1]. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used @@ -1064,7 +1064,7 @@ have to remove the help lines that begin with `#` in the commit log template yourself, if you do this). -commit.gpgsign:: +commit.gpgSign:: A boolean to specify whether all commits should be GPG signed. Use of this option when doing operations such as rebase can @@ -1177,7 +1177,7 @@ by mail. See the --to and --cc options in linkgit:git-format-patch[1]. -format.subjectprefix:: +format.subjectPrefix:: The default for format-patch is to output files with the '[PATCH]' subject prefix. Use this variable to change that prefix. @@ -1187,7 +1187,7 @@ Set this variable to the empty string ("") to suppress signature generation. -format.signaturefile:: +format.signatureFile:: Works just like format.signature except the contents of the file specified by this variable will be used as the signature. @@ -1211,7 +1211,7 @@ A true boolean value is the same as `shallow`, and a false value disables threading. -format.signoff:: +format.signOff:: A boolean value which lets you enable the `-s/--signoff` option of format-patch by default. *Note:* Adding the Signed-off-by: line to a patch should be a conscious act and means that you certify you have @@ -1250,17 +1250,17 @@ light-weight garbage collection from time to time. The default value is 6700. Setting this to 0 disables it. -gc.autopacklimit:: +gc.autoPackLimit:: When there are more than this many packs that are not marked with `*.keep` file in the repository, `git gc --auto` consolidates them into one larger pack. The default value is 50. Setting this to 0 disables it. -gc.autodetach:: +gc.autoDetach:: Make `git gc --auto` return immediately and run in background if the system supports it. Default is true. -gc.packrefs:: +gc.packRefs:: Running `git pack-refs` in a repository renders it unclonable by Git versions prior to 1.5.1.2 over dumb transports such as HTTP. This variable determines whether @@ -1268,38 +1268,38 @@ to enable it within all non-bare repos or it can be set to a boolean value. The default is `true`. -gc.pruneexpire:: +gc.pruneExpire:: When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'. Override the grace period with this config variable. The value "now" may be used to disable this grace period and always prune unreachable objects immediately. -gc.reflogexpire:: -gc.<pattern>.reflogexpire:: +gc.reflogExpire:: +gc.<pattern>.reflogExpire:: 'git reflog expire' removes reflog entries older than this time; defaults to 90 days. With "<pattern>" (e.g. "refs/stash") in the middle the setting applies only to the refs that match the <pattern>. -gc.reflogexpireunreachable:: -gc.<ref>.reflogexpireunreachable:: +gc.reflogExpireUnreachable:: +gc.<ref>.reflogExpireUnreachable:: 'git reflog expire' removes reflog entries older than this time and are not reachable from the current tip; defaults to 30 days. With "<pattern>" (e.g. "refs/stash") in the middle, the setting applies only to the refs that match the <pattern>. -gc.rerereresolved:: +gc.rerereResolved:: Records of conflicted merge you resolved earlier are kept for this many days when 'git rerere gc' is run. The default is 60 days. See linkgit:git-rerere[1]. -gc.rerereunresolved:: +gc.rerereUnresolved:: Records of conflicted merge you have not resolved are kept for this many days when 'git rerere gc' is run. The default is 15 days. See linkgit:git-rerere[1]. -gitcvs.commitmsgannotation:: +gitcvs.commitMsgAnnotation:: Append this string to each commit message. Set to empty string to disable this feature. Defaults to "via git-CVS emulator". @@ -1307,7 +1307,7 @@ Whether the CVS server interface is enabled for this repository. See linkgit:git-cvsserver[1]. -gitcvs.logfile:: +gitcvs.logFile:: Path to a log file where the CVS server interface well... logs various stuff. See linkgit:git-cvsserver[1]. @@ -1319,10 +1319,10 @@ treat it as text. If they suppress text conversion, the file will be set with '-kb' mode, which suppresses any newline munging the client might otherwise do. If the attributes do not allow - the file type to be determined, then 'gitcvs.allbinary' is + the file type to be determined, then 'gitcvs.allBinary' is used. See linkgit:gitattributes[5]. -gitcvs.allbinary:: +gitcvs.allBinary:: This is used if 'gitcvs.usecrlfattr' does not resolve the correct '-kb' mode to use. If true, all unresolved files are sent to the client in @@ -1332,7 +1332,7 @@ then the contents of the file are examined to decide if it is binary, similar to 'core.autocrlf'. -gitcvs.dbname:: +gitcvs.dbName:: Database used by git-cvsserver to cache revision information derived from the Git repository. The exact meaning depends on the used database driver, for SQLite (which is the default driver) this @@ -1340,7 +1340,7 @@ linkgit:git-cvsserver[1] for details). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite' -gitcvs.dbdriver:: +gitcvs.dbDriver:: Used Perl DBI driver. You can specify any available driver for this here, but it might not work. git-cvsserver is tested with 'DBD::SQLite', reported to work with 'DBD::Pg', and @@ -1348,10 +1348,10 @@ May not contain double colons (`:`). Default: 'SQLite'. See linkgit:git-cvsserver[1]. -gitcvs.dbuser, gitcvs.dbpass:: - Database user and password. Only useful if setting 'gitcvs.dbdriver', +gitcvs.dbUser, gitcvs.dbPass:: + Database user and password. Only useful if setting 'gitcvs.dbDriver', since SQLite has no concept of database users and/or passwords. - 'gitcvs.dbuser' supports variable substitution (see + 'gitcvs.dbUser' supports variable substitution (see linkgit:git-cvsserver[1] for details). gitcvs.dbTableNamePrefix:: @@ -1362,7 +1362,7 @@ characters will be replaced with underscores. All gitcvs variables except for 'gitcvs.usecrlfattr' and -'gitcvs.allbinary' can also be specified as +'gitcvs.allBinary' can also be specified as 'gitcvs.<access_method>.<varname>' (where 'access_method' is one of "ext" and "pserver") to make them apply only for the given access method. @@ -1380,7 +1380,7 @@ gitweb.patches:: gitweb.pickaxe:: gitweb.remote_heads:: -gitweb.showsizes:: +gitweb.showSizes:: gitweb.snapshot:: See linkgit:gitweb.conf[5] for description. @@ -1409,15 +1409,15 @@ signed, and the program is expected to send the result to its standard output. -gui.commitmsgwidth:: +gui.commitMsgWidth:: Defines how wide the commit message window is in the linkgit:git-gui[1]. "75" is the default. -gui.diffcontext:: +gui.diffContext:: Specifies how many context lines should be used in calls to diff made by the linkgit:git-gui[1]. The default is "5". -gui.displayuntracked:: +gui.displayUntracked:: Determines if linkgit::git-gui[1] shows untracked files in the file list. The default is "true". @@ -1429,16 +1429,16 @@ If this option is not set, the tools default to the locale encoding. -gui.matchtrackingbranch:: +gui.matchTrackingBranch:: Determines if new branches created with linkgit:git-gui[1] should default to tracking remote branches with matching names or not. Default: "false". -gui.newbranchtemplate:: +gui.newBranchTemplate:: Is used as suggested name when creating new branches using the linkgit:git-gui[1]. -gui.pruneduringfetch:: +gui.pruneDuringFetch:: "true" if linkgit:git-gui[1] should prune remote-tracking branches when performing a fetch. The default value is "false". @@ -1446,17 +1446,17 @@ Determines if linkgit:git-gui[1] should trust the file modification timestamp or not. By default the timestamps are not trusted. -gui.spellingdictionary:: +gui.spellingDictionary:: Specifies the dictionary used for spell checking commit messages in the linkgit:git-gui[1]. When set to "none" spell checking is turned off. -gui.fastcopyblame:: +gui.fastCopyBlame:: If true, 'git gui blame' uses `-C` instead of `-C -C` for original location detection. It makes blame significantly faster on huge repositories at the expense of less thorough copy detection. -gui.copyblamethreshold:: +gui.copyBlameThreshold:: Specifies the threshold to use in 'git gui blame' original location detection, measured in alphanumeric characters. See the linkgit:git-blame[1] manual for more information on copy detection. @@ -1476,22 +1476,22 @@ 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if the head is detached, 'CUR_BRANCH' is empty). -guitool.<name>.needsfile:: +guitool.<name>.needsFile:: Run the tool only if a diff is selected in the GUI. It guarantees that 'FILENAME' is not empty. -guitool.<name>.noconsole:: +guitool.<name>.noConsole:: Run the command silently, without creating a window to display its output. -guitool.<name>.norescan:: +guitool.<name>.noRescan:: Don't rescan the working directory for changes after the tool finishes execution. guitool.<name>.confirm:: Show a confirmation dialog before actually running the tool. -guitool.<name>.argprompt:: +guitool.<name>.argPrompt:: Request a string argument from the user, and pass it to the tool through the 'ARGS' environment variable. Since requesting an argument implies confirmation, the 'confirm' option has no effect @@ -1499,13 +1499,13 @@ the dialog uses a built-in generic prompt; otherwise the exact value of the variable is used. -guitool.<name>.revprompt:: +guitool.<name>.revPrompt:: Request a single valid revision from the user, and set the 'REVISION' environment variable. In other aspects this option - is similar to 'argprompt', and can be used together with it. + is similar to 'argPrompt', and can be used together with it. -guitool.<name>.revunmerged:: - Show only unmerged branches in the 'revprompt' subdialog. +guitool.<name>.revUnmerged:: + Show only unmerged branches in the 'revPrompt' subdialog. This is useful for tools similar to merge or rebase, but not for things like checkout or reset. @@ -1515,7 +1515,7 @@ guitool.<name>.prompt:: Specifies the general prompt string to display at the top of - the dialog, before subsections for 'argprompt' and 'revprompt'. + the dialog, before subsections for 'argPrompt' and 'revPrompt'. The default value includes the actual command. help.browser:: @@ -1527,7 +1527,7 @@ Values 'man', 'info', 'web' and 'html' are supported. 'man' is the default. 'web' and 'html' are the same. -help.autocorrect:: +help.autoCorrect:: Automatically correct and execute mistyped commands after waiting for the given number of deciseconds (0.1 sec). If more than one command can be deduced from the entered text, nothing @@ -1536,7 +1536,7 @@ value is 0 - the command will be just shown but not executed. This is the default. -help.htmlpath:: +help.htmlPath:: Specify the path where the HTML documentation resides. File system paths and URLs are supported. HTML pages will be prefixed with this path when help is displayed in the 'web' format. This defaults to the documentation @@ -1548,17 +1548,17 @@ `curl(1)`). This can be overridden on a per-remote basis; see remote.<name>.proxy -http.cookiefile:: +http.cookieFile:: File containing previously stored cookie lines which should be used in the Git http session, if they match the server. The file format of the file to read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie file format (see linkgit:curl[1]). - NOTE that the file specified with http.cookiefile is only used as + NOTE that the file specified with http.cookieFile is only used as input unless http.saveCookies is set. -http.savecookies:: +http.saveCookies:: If set, store cookies received during requests to the file specified by - http.cookiefile. Has no effect if http.cookiefile is unset. + http.cookieFile. Has no effect if http.cookieFile is unset. http.sslVerify:: Whether to verify the SSL certificate when fetching or pushing @@ -1629,7 +1629,7 @@ support EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV' environment variable. Default is false (curl will use EPSV). -http.useragent:: +http.userAgent:: The HTTP USER_AGENT string presented to an HTTP server. The default value represents the version of the client Git such as git/1.7.1. This option allows you to override this value to a more common value @@ -1702,7 +1702,7 @@ Specify the version with which new index files should be initialized. This does not affect existing repositories. -init.templatedir:: +init.templateDir:: Specify the directory from which templates will be copied. (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].) @@ -1718,7 +1718,7 @@ If true the web server started by linkgit:git-instaweb[1] will be bound to the local IP (127.0.0.1). -instaweb.modulepath:: +instaweb.modulePath:: The default module path for linkgit:git-instaweb[1] to use instead of /usr/lib/apache2/modules. Only used if httpd is Apache. @@ -1727,7 +1727,7 @@ The port number to bind the gitweb httpd to. See linkgit:git-instaweb[1]. -interactive.singlekey:: +interactive.singleKey:: In interactive commands, allow the user to provide one-letter input with a single key (i.e., without hitting enter). Currently this is used by the `--patch` mode of @@ -1755,7 +1755,7 @@ specified, the full ref name (including prefix) will be printed. This is the same as the log commands '--decorate' option. -log.showroot:: +log.showRoot:: If true, the initial commit will be shown as a big creation event. This is equivalent to a diff against an empty tree. Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which @@ -1992,7 +1992,7 @@ true. You should not generally need to turn this off unless you are debugging pack bitmaps. -pack.writebitmaps (deprecated):: +pack.writeBitmaps (deprecated):: This is a deprecated synonym for `repack.writeBitmaps`. pack.writeBitmapHashCache:: @@ -2111,14 +2111,20 @@ -- +push.followTags:: + If set to true enable '--follow-tags' option by default. You + may override this configuration at time of push by specifying + '--no-follow-tags'. + + rebase.stat:: Whether to show a diffstat of what changed upstream since the last rebase. False by default. -rebase.autosquash:: +rebase.autoSquash:: If set to true enable '--autosquash' option by default. -rebase.autostash:: +rebase.autoStash:: When set to true, automatically create a temporary stash before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. @@ -2126,7 +2132,7 @@ successful rebase might result in non-trivial conflicts. Defaults to false. -receive.advertiseatomic:: +receive.advertiseAtomic:: By default, git-receive-pack will advertise the atomic push capability to its clients. If you don't want to this capability to be advertised, set this variable to false. @@ -2136,13 +2142,13 @@ receiving data from git-push and updating refs. You can stop it by setting this variable to false. -receive.certnonceseed:: +receive.certNonceSeed:: By setting this variable to a string, `git receive-pack` will accept a `git push --signed` and verifies it by using a "nonce" protected by HMAC using this string as a secret key. -receive.certnonceslop:: +receive.certNonceSlop:: When a `git push --signed` sent a push certificate with a "nonce" that was issued by a receive-pack serving the same repository within this many seconds, export the "nonce" @@ -2206,7 +2212,7 @@ even if that push is forced. This configuration variable is set when initializing a shared repository. -receive.hiderefs:: +receive.hideRefs:: String(s) `receive-pack` uses to decide which refs to omit from its initial advertisement. Use more than one definitions to specify multiple prefix strings. A ref that @@ -2215,18 +2221,18 @@ push`, and an attempt to update or delete a hidden ref by `git push` is rejected. -receive.updateserverinfo:: +receive.updateServerInfo:: If set to true, git-receive-pack will run git-update-server-info after receiving data from git-push and updating refs. -receive.shallowupdate:: +receive.shallowUpdate:: If set to true, .git/shallow can be updated when new refs require new shallow roots. Otherwise those refs are rejected. -remote.pushdefault:: +remote.pushDefault:: The remote to push to by default. Overrides `branch.<name>.remote` for all branches, and is overridden by - `branch.<name>.pushremote` for specific branches. + `branch.<name>.pushRemote` for specific branches. remote.<name>.url:: The URL of a remote repository. See linkgit:git-fetch[1] or @@ -2270,7 +2276,7 @@ The default program to execute on the remote side when fetching. See option \--upload-pack of linkgit:git-fetch-pack[1]. -remote.<name>.tagopt:: +remote.<name>.tagOpt:: Setting this value to \--no-tags disables automatic tag following when fetching from remote <name>. Setting it to \--tags will fetch every tag from remote <name>, even if they are not reachable from remote @@ -2292,7 +2298,7 @@ The list of remotes which are fetched by "git remote update <group>". See linkgit:git-remote[1]. -repack.usedeltabaseoffset:: +repack.useDeltaBaseOffset:: By default, linkgit:git-repack[1] creates packs that use delta-base offset. If you need to share your repository with Git older than version 1.4.4, either directly or via a dumb @@ -2315,7 +2321,7 @@ space and extra time spent on the initial repack. Defaults to false. -rerere.autoupdate:: +rerere.autoUpdate:: When set to true, `git-rerere` updates the index with the resulting contents after it cleanly resolves conflicts using previously recorded resolution. Defaults to false. @@ -2334,12 +2340,12 @@ values in the 'sendemail' section. The default identity is the value of 'sendemail.identity'. -sendemail.smtpencryption:: +sendemail.smtpEncryption:: See linkgit:git-send-email[1] for description. Note that this setting is not subject to the 'identity' mechanism. sendemail.smtpssl (deprecated):: - Deprecated alias for 'sendemail.smtpencryption = ssl'. + Deprecated alias for 'sendemail.smtpEncryption = ssl'. sendemail.smtpsslcertpath:: Path to ca-certificates (either a directory or a single file). @@ -2351,29 +2357,29 @@ identity is selected, through command-line or 'sendemail.identity'. -sendemail.aliasesfile:: -sendemail.aliasfiletype:: +sendemail.aliasesFile:: +sendemail.aliasFileType:: sendemail.annotate:: sendemail.bcc:: sendemail.cc:: -sendemail.cccmd:: -sendemail.chainreplyto:: +sendemail.ccCmd:: +sendemail.chainReplyTo:: sendemail.confirm:: -sendemail.envelopesender:: +sendemail.envelopeSender:: sendemail.from:: -sendemail.multiedit:: +sendemail.multiEdit:: sendemail.signedoffbycc:: -sendemail.smtppass:: +sendemail.smtpPass:: sendemail.suppresscc:: -sendemail.suppressfrom:: +sendemail.suppressFrom:: sendemail.to:: -sendemail.smtpdomain:: -sendemail.smtpserver:: -sendemail.smtpserverport:: -sendemail.smtpserveroption:: -sendemail.smtpuser:: +sendemail.smtpDomain:: +sendemail.smtpServer:: +sendemail.smtpServerPort:: +sendemail.smtpServerOption:: +sendemail.smtpUser:: sendemail.thread:: -sendemail.transferencoding:: +sendemail.transferEncoding:: sendemail.validate:: sendemail.xmailer:: See linkgit:git-send-email[1] for description. @@ -2425,7 +2431,7 @@ This variable can be overridden with the -u|--untracked-files option of linkgit:git-status[1] and linkgit:git-commit[1]. -status.submodulesummary:: +status.submoduleSummary:: Defaults to false. If this is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled and a @@ -2500,9 +2506,9 @@ not set, the value of this variable is used instead. Defaults to false. -transfer.hiderefs:: - This variable can be used to set both `receive.hiderefs` - and `uploadpack.hiderefs` at the same time to the same +transfer.hideRefs:: + This variable can be used to set both `receive.hideRefs` + and `uploadpack.hideRefs` at the same time to the same values. See entries for these other variables. transfer.unpackLimit:: @@ -2517,7 +2523,7 @@ linkgit:git-upload-archive[1] for more details. Defaults to `false`. -uploadpack.hiderefs:: +uploadpack.hideRefs:: String(s) `upload-pack` uses to decide which refs to omit from its initial advertisement. Use more than one definitions to specify multiple prefix strings. A ref that @@ -2527,12 +2533,12 @@ fetch` will fail. See also `uploadpack.allowtipsha1inwant`. uploadpack.allowtipsha1inwant:: - When `uploadpack.hiderefs` is in effect, allow `upload-pack` + When `uploadpack.hideRefs` is in effect, allow `upload-pack` to accept a fetch request that asks for an object at the tip of a hidden ref (by default, such a request is rejected). - see also `uploadpack.hiderefs`. + see also `uploadpack.hideRefs`. -uploadpack.keepalive:: +uploadpack.keepAlive:: When `upload-pack` has started `pack-objects`, there may be a quiet period while `pack-objects` prepares the pack. Normally it would output progress information, but if `--quiet` was used @@ -2540,7 +2546,7 @@ the pack data begins. Some clients and networks may consider the server to be hung and give up. Setting this option instructs `upload-pack` to send an empty keepalive packet every - `uploadpack.keepalive` seconds. Setting this option to 0 + `uploadpack.keepAlive` seconds. Setting this option to 0 disables keepalive packets entirely. The default is 5 seconds. url.<base>.insteadOf:: @@ -2577,7 +2583,7 @@ Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME' environment variables. See linkgit:git-commit-tree[1]. -user.signingkey:: +user.signingKey:: If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the key you want it to automatically when creating a signed tag or commit, you can override the default selection with this variable. diff --git a/diff-config.txt b/diff-config.txt index b001779..6eaa452 100644 --- a/diff-config.txt +++ b/diff-config.txt
@@ -1,4 +1,4 @@ -diff.autorefreshindex:: +diff.autoRefreshIndex:: When using 'git diff' to compare with work tree files, do not consider stat-only change as changed. Instead, silently run `git update-index --refresh` to @@ -75,11 +75,11 @@ commands such as 'git diff-files'. 'git checkout' also honors this setting when reporting uncommitted changes. Setting it to 'all' disables the submodule summary normally shown by 'git commit' - and 'git status' when 'status.submodulesummary' is set unless it is + and 'git status' when 'status.submoduleSummary' is set unless it is overridden by using the --ignore-submodules command-line option. The 'git submodule' commands are not affected by this setting. -diff.mnemonicprefix:: +diff.mnemonicPrefix:: If set, 'git diff' uses a prefix pair that is different from the standard "a/" and "b/" depending on what is being compared. When this configuration is in effect, reverse diff output also swaps @@ -98,7 +98,7 @@ diff.noprefix:: If set, 'git diff' does not show any source or destination prefix. -diff.orderfile:: +diff.orderFile:: File indicating how to order files within a diff, using one shell glob pattern per line. Can be overridden by the '-O' option to linkgit:git-diff[1]. @@ -148,7 +148,7 @@ conversion is used to generate a human-readable diff. See linkgit:gitattributes[5] for details. -diff.<driver>.wordregex:: +diff.<driver>.wordRegex:: The regular expression that the diff driver should use to split words in a line. See linkgit:gitattributes[5] for details.
diff --git a/diff-options.txt b/diff-options.txt index 6cb083a..ccd4998 100644 --- a/diff-options.txt +++ b/diff-options.txt
@@ -432,8 +432,8 @@ -O<orderfile>:: Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line. - This overrides the `diff.orderfile` configuration variable - (see linkgit:git-config[1]). To cancel `diff.orderfile`, + This overrides the `diff.orderFile` configuration variable + (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`. ifndef::git-format-patch[]
diff --git a/fetch-options.txt b/fetch-options.txt index b09a783..45583d8 100644 --- a/fetch-options.txt +++ b/fetch-options.txt
@@ -68,7 +68,7 @@ By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following. The default - behavior for a remote may be specified with the remote.<name>.tagopt + behavior for a remote may be specified with the remote.<name>.tagOpt setting. See linkgit:git-config[1]. ifndef::git-pull[]
diff --git a/git-add.html b/git-add.html index 126cb42..922a1f4 100644 --- a/git-add.html +++ b/git-add.html
@@ -1006,7 +1006,7 @@ <div class="sect1"> <h2 id="_configuration">Configuration</h2> <div class="sectionbody"> -<div class="paragraph"><p>The optional configuration variable <code>core.excludesfile</code> indicates a path to a +<div class="paragraph"><p>The optional configuration variable <code>core.excludesFile</code> indicates a path to a file containing patterns of file names to exclude from git-add, similar to $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to those in info/exclude. See <a href="gitignore.html">gitignore(5)</a>.</p></div> @@ -1172,7 +1172,7 @@ <div class="paragraph"><p>After deciding the fate for all hunks, if there is any hunk that was chosen, the index is updated with the selected hunks.</p></div> <div class="paragraph"><p>You can omit having to type return here, by setting the configuration -variable <code>interactive.singlekey</code> to <code>true</code>.</p></div> +variable <code>interactive.singleKey</code> to <code>true</code>.</p></div> </dd> <dt class="hdlist1"> diff @@ -1319,7 +1319,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-01-14 14:00:12 PST +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-add.txt b/git-add.txt index 1c74907..f2eb907 100644 --- a/git-add.txt +++ b/git-add.txt
@@ -173,7 +173,7 @@ Configuration ------------- -The optional configuration variable `core.excludesfile` indicates a path to a +The optional configuration variable `core.excludesFile` indicates a path to a file containing patterns of file names to exclude from git-add, similar to $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to those in info/exclude. See linkgit:gitignore[5]. @@ -317,7 +317,7 @@ that was chosen, the index is updated with the selected hunks. + You can omit having to type return here, by setting the configuration -variable `interactive.singlekey` to `true`. +variable `interactive.singleKey` to `true`. diff::
diff --git a/git-annotate.html b/git-annotate.html index 0868bc3..86fcba1 100644 --- a/git-annotate.html +++ b/git-annotate.html
@@ -783,7 +783,7 @@ <dd> <p> Do not treat root commits as boundaries. This can also be - controlled via the <code>blame.showroot</code> config option. + controlled via the <code>blame.showRoot</code> config option. </p> </dd> <dt class="hdlist1">
diff --git a/git-apply.html b/git-apply.html index 4f93d83..ba9c842 100644 --- a/git-apply.html +++ b/git-apply.html
@@ -1150,7 +1150,7 @@ <div class="sectionbody"> <div class="dlist"><dl> <dt class="hdlist1"> -apply.ignorewhitespace +apply.ignoreWhitespace </dt> <dd> <p> @@ -1202,7 +1202,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-03-03 15:13:37 PST +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-apply.txt b/git-apply.txt index 9489664..d9ed6a1 100644 --- a/git-apply.txt +++ b/git-apply.txt
@@ -242,7 +242,7 @@ Configuration ------------- -apply.ignorewhitespace:: +apply.ignoreWhitespace:: Set to 'change' if you want changes in whitespace to be ignored by default. Set to one of: no, none, never, false if you want changes in whitespace to be significant.
diff --git a/git-blame.html b/git-blame.html index bec1e3e..b024a91 100644 --- a/git-blame.html +++ b/git-blame.html
@@ -803,7 +803,7 @@ <dd> <p> Do not treat root commits as boundaries. This can also be - controlled via the <code>blame.showroot</code> config option. + controlled via the <code>blame.showRoot</code> config option. </p> </dd> <dt class="hdlist1">
diff --git a/git-branch.html b/git-branch.html index fc6fe07..0efa2a4 100644 --- a/git-branch.html +++ b/git-branch.html
@@ -790,7 +790,7 @@ branch (specifically the <code>branch.<name>.remote</code> and <code>branch.<name>.merge</code> configuration entries) so that <em>git pull</em> will appropriately merge from the remote-tracking branch. This behavior may be changed via the global -<code>branch.autosetupmerge</code> configuration flag. That setting can be +<code>branch.autoSetupMerge</code> configuration flag. That setting can be overridden by using the <code>--track</code> and <code>--no-track</code> options, and changed later using <code>git branch --set-upstream-to</code>.</p></div> <div class="paragraph"><p>With a <code>-m</code> or <code>-M</code> option, <oldbranch> will be renamed to <newbranch>. @@ -1009,7 +1009,7 @@ upstream when the new branch is checked out. </p> <div class="paragraph"><p>This behavior is the default when the start point is a remote-tracking branch. -Set the branch.autosetupmerge configuration variable to <code>false</code> if you +Set the branch.autoSetupMerge configuration variable to <code>false</code> if you want <code>git checkout</code> and <code>git branch</code> to always behave as if <em>--no-track</em> were given. Set it to <code>always</code> if you want this behavior when the start-point is either a local or remote-tracking branch.</p></div> @@ -1020,7 +1020,7 @@ <dd> <p> Do not set up "upstream" configuration, even if the - branch.autosetupmerge configuration variable is true. + branch.autoSetupMerge configuration variable is true. </p> </dd> <dt class="hdlist1"> @@ -1238,7 +1238,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-09-20 14:03:14 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-branch.txt b/git-branch.txt index 311b336..359619b 100644 --- a/git-branch.txt +++ b/git-branch.txt
@@ -51,7 +51,7 @@ branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global -`branch.autosetupmerge` configuration flag. That setting can be +`branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`. @@ -166,14 +166,14 @@ upstream when the new branch is checked out. + This behavior is the default when the start point is a remote-tracking branch. -Set the branch.autosetupmerge configuration variable to `false` if you +Set the branch.autoSetupMerge configuration variable to `false` if you want `git checkout` and `git branch` to always behave as if '--no-track' were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch. --no-track:: Do not set up "upstream" configuration, even if the - branch.autosetupmerge configuration variable is true. + branch.autoSetupMerge configuration variable is true. --set-upstream:: If specified branch does not exist yet or if `--force` has been
diff --git a/git-check-ignore.html b/git-check-ignore.html index 8a45ead..af4c2f6 100644 --- a/git-check-ignore.html +++ b/git-check-ignore.html
@@ -846,7 +846,7 @@ is the line number of the pattern within that source. If the pattern contained a <code>!</code> prefix or <code>/</code> suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file -configured by <code>core.excludesfile</code>, or relative to the repository root +configured by <code>core.excludesFile</code>, or relative to the repository root when referring to <code>.git/info/exclude</code> or a per-directory exclude file.</p></div> <div class="paragraph"><p>If <code>-z</code> is specified, the pathnames in the output are delimited by the null character; if <code>--verbose</code> is also specified then null characters @@ -916,7 +916,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-12-22 14:47:31 PST +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-check-ignore.txt b/git-check-ignore.txt index 788a011..e35cd04 100644 --- a/git-check-ignore.txt +++ b/git-check-ignore.txt
@@ -72,7 +72,7 @@ is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file -configured by `core.excludesfile`, or relative to the repository root +configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file. If `-z` is specified, the pathnames in the output are delimited by the
diff --git a/git-checkout.html b/git-checkout.html index 3d2da8a..e2b965a 100644 --- a/git-checkout.html +++ b/git-checkout.html
@@ -945,7 +945,7 @@ <dd> <p> Do not set up "upstream" configuration, even if the - branch.autosetupmerge configuration variable is true. + branch.autoSetupMerge configuration variable is true. </p> </dd> <dt class="hdlist1"> @@ -1038,7 +1038,7 @@ <p> The same as --merge option above, but changes the way the conflicting hunks are presented, overriding the - merge.conflictstyle configuration variable. Possible values are + merge.conflictStyle configuration variable. Possible values are "merge" (default) and "diff3" (in addition to what is shown by "merge" style, shows the original contents). </p> @@ -1363,7 +1363,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-01-27 13:30:07 PST +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-checkout.txt b/git-checkout.txt index 33ad2ad..d504108 100644 --- a/git-checkout.txt +++ b/git-checkout.txt
@@ -144,7 +144,7 @@ --no-track:: Do not set up "upstream" configuration, even if the - branch.autosetupmerge configuration variable is true. + branch.autoSetupMerge configuration variable is true. -l:: Create the new branch's reflog; see linkgit:git-branch[1] for @@ -210,7 +210,7 @@ --conflict=<style>:: The same as --merge option above, but changes the way the conflicting hunks are presented, overriding the - merge.conflictstyle configuration variable. Possible values are + merge.conflictStyle configuration variable. Possible values are "merge" (default) and "diff3" (in addition to what is shown by "merge" style, shows the original contents).
diff --git a/git-commit-tree.html b/git-commit-tree.html index c6031c3..2d891db 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html
@@ -831,7 +831,7 @@ </dt> <dd> <p> - Countermand <code>commit.gpgsign</code> configuration variable that is + Countermand <code>commit.gpgSign</code> configuration variable that is set to force each and every commit to be signed. </p> </dd> @@ -1030,7 +1030,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-02-27 15:06:29 PST +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-commit-tree.txt b/git-commit-tree.txt index a469eab..f5f2a8d 100644 --- a/git-commit-tree.txt +++ b/git-commit-tree.txt
@@ -59,7 +59,7 @@ GPG-sign commit. --no-gpg-sign:: - Countermand `commit.gpgsign` configuration variable that is + Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed.
diff --git a/git-commit.html b/git-commit.html index ea35f85..e4842a6 100644 --- a/git-commit.html +++ b/git-commit.html
@@ -1326,7 +1326,7 @@ </dt> <dd> <p> - Countermand <code>commit.gpgsign</code> configuration variable that is + Countermand <code>commit.gpgSign</code> configuration variable that is set to force each and every commit to be signed. </p> </dd> @@ -1628,7 +1628,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-03-17 16:38:37 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-commit.txt b/git-commit.txt index f14d2ec..617e29b 100644 --- a/git-commit.txt +++ b/git-commit.txt
@@ -314,7 +314,7 @@ GPG-sign commit. --no-gpg-sign:: - Countermand `commit.gpgsign` configuration variable that is + Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed. \--::
diff --git a/git-config.html b/git-config.html index 6c0bb97..7618c5b 100644 --- a/git-config.html +++ b/git-config.html
@@ -1324,7 +1324,7 @@ % git config --bool --get-urlmatch http.sslverify https://weak.example.com false % git config --get-urlmatch http https://weak.example.com -http.cookiefile /tmp/cookie.txt +http.cookieFile /tmp/cookie.txt http.sslverify false</code></pre> </div></div> </div> @@ -1711,7 +1711,7 @@ <div class="paragraph"><p>The default is true (when core.filemode is not specified in the config file).</p></div> </dd> <dt class="hdlist1"> -core.ignorecase +core.ignoreCase </dt> <dd> <p> @@ -1723,16 +1723,16 @@ "Makefile". </p> <div class="paragraph"><p>The default is false, except <a href="git-clone.html">git-clone(1)</a> or <a href="git-init.html">git-init(1)</a> -will probe and set core.ignorecase true if appropriate when the repository +will probe and set core.ignoreCase true if appropriate when the repository is created.</p></div> </dd> <dt class="hdlist1"> -core.precomposeunicode +core.precomposeUnicode </dt> <dd> <p> This option is only used by Mac OS implementation of Git. - When core.precomposeunicode=true, Git reverts the unicode decomposition + When core.precomposeUnicode=true, Git reverts the unicode decomposition of filenames done by Mac OS. This is useful when sharing a repository between Mac OS and Linux or Windows. (Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7). @@ -1774,7 +1774,7 @@ </p> </dd> <dt class="hdlist1"> -core.checkstat +core.checkStat </dt> <dd> <p> @@ -1785,7 +1785,7 @@ </p> </dd> <dt class="hdlist1"> -core.quotepath +core.quotePath </dt> <dd> <p> @@ -2048,11 +2048,11 @@ -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If set, this provides a default to other compression variables, - such as <em>core.loosecompression</em> and <em>pack.compression</em>. + such as <em>core.looseCompression</em> and <em>pack.compression</em>. </p> </dd> <dt class="hdlist1"> -core.loosecompression +core.looseCompression </dt> <dd> <p> @@ -2130,7 +2130,7 @@ <div class="paragraph"><p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p></div> </dd> <dt class="hdlist1"> -core.excludesfile +core.excludesFile </dt> <dd> <p> @@ -2144,7 +2144,7 @@ </p> </dd> <dt class="hdlist1"> -core.askpass +core.askPass </dt> <dd> <p> @@ -2158,14 +2158,14 @@ </p> </dd> <dt class="hdlist1"> -core.attributesfile +core.attributesFile </dt> <dd> <p> In addition to <em>.gitattributes</em> (per-directory) and <em>.git/info/attributes</em>, Git looks into this file for attributes (see <a href="gitattributes.html">gitattributes(5)</a>). Path expansions are made the same - way as for <code>core.excludesfile</code>. Its default value is + way as for <code>core.excludesFile</code>. Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/attributes is used instead. </p> @@ -2182,7 +2182,7 @@ </p> </dd> <dt class="hdlist1"> -core.commentchar +core.commentChar </dt> <dd> <p> @@ -2301,7 +2301,7 @@ </ul></div> </dd> <dt class="hdlist1"> -core.fsyncobjectfiles +core.fsyncObjectFiles </dt> <dd> <p> @@ -2313,7 +2313,7 @@ and not file contents (OS X’s HFS+, or Linux ext3 with "data=writeback").</p></div> </dd> <dt class="hdlist1"> -core.preloadindex +core.preloadIndex </dt> <dd> <p> @@ -2422,7 +2422,7 @@ </p> </dd> <dt class="hdlist1"> -apply.ignorewhitespace +apply.ignoreWhitespace </dt> <dd> <p> @@ -2444,7 +2444,7 @@ </p> </dd> <dt class="hdlist1"> -branch.autosetupmerge +branch.autoSetupMerge </dt> <dd> <p> @@ -2460,7 +2460,7 @@ </p> </dd> <dt class="hdlist1"> -branch.autosetuprebase +branch.autoSetupRebase </dt> <dd> <p> @@ -2474,7 +2474,7 @@ remote-tracking branches. When <code>always</code>, rebase will be set to true for all tracking branches. - See "branch.autosetupmerge" for details on how to set up a + See "branch.autoSetupMerge" for details on how to set up a branch to track another branch. This option defaults to never. </p> @@ -2486,25 +2486,25 @@ <p> When on branch <name>, it tells <em>git fetch</em> and <em>git push</em> which remote to fetch from/push to. The remote to push to - may be overridden with <code>remote.pushdefault</code> (for all branches). + may be overridden with <code>remote.pushDefault</code> (for all branches). The remote to push to, for the current branch, may be further - overridden by <code>branch.<name>.pushremote</code>. If no remote is + overridden by <code>branch.<name>.pushRemote</code>. If no remote is configured, or if you are not on any branch, it defaults to - <code>origin</code> for fetching and <code>remote.pushdefault</code> for pushing. + <code>origin</code> for fetching and <code>remote.pushDefault</code> for pushing. Additionally, <code>.</code> (a period) is the current local repository (a dot-repository), see <code>branch.<name>.merge</code>'s final note below. </p> </dd> <dt class="hdlist1"> -branch.<name>.pushremote +branch.<name>.pushRemote </dt> <dd> <p> When on branch <name>, it overrides <code>branch.<name>.remote</code> for - pushing. It also overrides <code>remote.pushdefault</code> for pushing + pushing. It also overrides <code>remote.pushDefault</code> for pushing from branch <name>. When you pull from one place (e.g. your upstream) and push to another place (e.g. your own publishing - repository), you would want to set <code>remote.pushdefault</code> to + repository), you would want to set <code>remote.pushDefault</code> to specify the remote to push to for all branches, and use this option to override it for a specific branch. </p> @@ -2533,7 +2533,7 @@ </p> </dd> <dt class="hdlist1"> -branch.<name>.mergeoptions +branch.<name>.mergeOptions </dt> <dd> <p> @@ -2795,7 +2795,7 @@ </p> </dd> <dt class="hdlist1"> -color.showbranch +color.showBranch </dt> <dd> <p> @@ -2996,7 +2996,7 @@ </p> </dd> <dt class="hdlist1"> -commit.gpgsign +commit.gpgSign </dt> <dd> <p> @@ -3071,7 +3071,7 @@ </p> </dd> <dt class="hdlist1"> -diff.autorefreshindex +diff.autoRefreshIndex </dt> <dd> <p> @@ -3207,13 +3207,13 @@ commands such as <em>git diff-files</em>. <em>git checkout</em> also honors this setting when reporting uncommitted changes. Setting it to <em>all</em> disables the submodule summary normally shown by <em>git commit</em> - and <em>git status</em> when <em>status.submodulesummary</em> is set unless it is + and <em>git status</em> when <em>status.submoduleSummary</em> is set unless it is overridden by using the --ignore-submodules command-line option. The <em>git submodule</em> commands are not affected by this setting. </p> </dd> <dt class="hdlist1"> -diff.mnemonicprefix +diff.mnemonicPrefix </dt> <dd> <p> @@ -3274,7 +3274,7 @@ </p> </dd> <dt class="hdlist1"> -diff.orderfile +diff.orderFile </dt> <dd> <p> @@ -3374,7 +3374,7 @@ </p> </dd> <dt class="hdlist1"> -diff.<driver>.wordregex +diff.<driver>.wordRegex </dt> <dd> <p> @@ -3691,7 +3691,7 @@ </p> </dd> <dt class="hdlist1"> -format.subjectprefix +format.subjectPrefix </dt> <dd> <p> @@ -3711,7 +3711,7 @@ </p> </dd> <dt class="hdlist1"> -format.signaturefile +format.signatureFile </dt> <dd> <p> @@ -3755,7 +3755,7 @@ </p> </dd> <dt class="hdlist1"> -format.signoff +format.signOff </dt> <dd> <p> @@ -3829,7 +3829,7 @@ </p> </dd> <dt class="hdlist1"> -gc.autopacklimit +gc.autoPackLimit </dt> <dd> <p> @@ -3840,7 +3840,7 @@ </p> </dd> <dt class="hdlist1"> -gc.autodetach +gc.autoDetach </dt> <dd> <p> @@ -3849,7 +3849,7 @@ </p> </dd> <dt class="hdlist1"> -gc.packrefs +gc.packRefs </dt> <dd> <p> @@ -3862,7 +3862,7 @@ </p> </dd> <dt class="hdlist1"> -gc.pruneexpire +gc.pruneExpire </dt> <dd> <p> @@ -3873,10 +3873,10 @@ </p> </dd> <dt class="hdlist1"> -gc.reflogexpire +gc.reflogExpire </dt> <dt class="hdlist1"> -gc.<pattern>.reflogexpire +gc.<pattern>.reflogExpire </dt> <dd> <p> @@ -3887,10 +3887,10 @@ </p> </dd> <dt class="hdlist1"> -gc.reflogexpireunreachable +gc.reflogExpireUnreachable </dt> <dt class="hdlist1"> -gc.<ref>.reflogexpireunreachable +gc.<ref>.reflogExpireUnreachable </dt> <dd> <p> @@ -3902,7 +3902,7 @@ </p> </dd> <dt class="hdlist1"> -gc.rerereresolved +gc.rerereResolved </dt> <dd> <p> @@ -3912,7 +3912,7 @@ </p> </dd> <dt class="hdlist1"> -gc.rerereunresolved +gc.rerereUnresolved </dt> <dd> <p> @@ -3922,7 +3922,7 @@ </p> </dd> <dt class="hdlist1"> -gitcvs.commitmsgannotation +gitcvs.commitMsgAnnotation </dt> <dd> <p> @@ -3940,7 +3940,7 @@ </p> </dd> <dt class="hdlist1"> -gitcvs.logfile +gitcvs.logFile </dt> <dd> <p> @@ -3960,12 +3960,12 @@ treat it as text. If they suppress text conversion, the file will be set with <em>-kb</em> mode, which suppresses any newline munging the client might otherwise do. If the attributes do not allow - the file type to be determined, then <em>gitcvs.allbinary</em> is + the file type to be determined, then <em>gitcvs.allBinary</em> is used. See <a href="gitattributes.html">gitattributes(5)</a>. </p> </dd> <dt class="hdlist1"> -gitcvs.allbinary +gitcvs.allBinary </dt> <dd> <p> @@ -3980,7 +3980,7 @@ </p> </dd> <dt class="hdlist1"> -gitcvs.dbname +gitcvs.dbName </dt> <dd> <p> @@ -3993,7 +3993,7 @@ </p> </dd> <dt class="hdlist1"> -gitcvs.dbdriver +gitcvs.dbDriver </dt> <dd> <p> @@ -4006,13 +4006,13 @@ </p> </dd> <dt class="hdlist1"> -gitcvs.dbuser, gitcvs.dbpass +gitcvs.dbUser, gitcvs.dbPass </dt> <dd> <p> - Database user and password. Only useful if setting <em>gitcvs.dbdriver</em>, + Database user and password. Only useful if setting <em>gitcvs.dbDriver</em>, since SQLite has no concept of database users and/or passwords. - <em>gitcvs.dbuser</em> supports variable substitution (see + <em>gitcvs.dbUser</em> supports variable substitution (see <a href="git-cvsserver.html">git-cvsserver(1)</a> for details). </p> </dd> @@ -4030,7 +4030,7 @@ </dd> </dl></div> <div class="paragraph"><p>All gitcvs variables except for <em>gitcvs.usecrlfattr</em> and -<em>gitcvs.allbinary</em> can also be specified as +<em>gitcvs.allBinary</em> can also be specified as <em>gitcvs.<access_method>.<varname></em> (where <em>access_method</em> is one of "ext" and "pserver") to make them apply only for the given access method.</p></div> @@ -4074,7 +4074,7 @@ gitweb.remote_heads </dt> <dt class="hdlist1"> -gitweb.showsizes +gitweb.showSizes </dt> <dt class="hdlist1"> gitweb.snapshot @@ -4130,7 +4130,7 @@ </p> </dd> <dt class="hdlist1"> -gui.commitmsgwidth +gui.commitMsgWidth </dt> <dd> <p> @@ -4139,7 +4139,7 @@ </p> </dd> <dt class="hdlist1"> -gui.diffcontext +gui.diffContext </dt> <dd> <p> @@ -4148,7 +4148,7 @@ </p> </dd> <dt class="hdlist1"> -gui.displayuntracked +gui.displayUntracked </dt> <dd> <p> @@ -4170,7 +4170,7 @@ </p> </dd> <dt class="hdlist1"> -gui.matchtrackingbranch +gui.matchTrackingBranch </dt> <dd> <p> @@ -4180,7 +4180,7 @@ </p> </dd> <dt class="hdlist1"> -gui.newbranchtemplate +gui.newBranchTemplate </dt> <dd> <p> @@ -4189,7 +4189,7 @@ </p> </dd> <dt class="hdlist1"> -gui.pruneduringfetch +gui.pruneDuringFetch </dt> <dd> <p> @@ -4207,7 +4207,7 @@ </p> </dd> <dt class="hdlist1"> -gui.spellingdictionary +gui.spellingDictionary </dt> <dd> <p> @@ -4217,7 +4217,7 @@ </p> </dd> <dt class="hdlist1"> -gui.fastcopyblame +gui.fastCopyBlame </dt> <dd> <p> @@ -4227,7 +4227,7 @@ </p> </dd> <dt class="hdlist1"> -gui.copyblamethreshold +gui.copyBlameThreshold </dt> <dd> <p> @@ -4262,7 +4262,7 @@ </p> </dd> <dt class="hdlist1"> -guitool.<name>.needsfile +guitool.<name>.needsFile </dt> <dd> <p> @@ -4271,7 +4271,7 @@ </p> </dd> <dt class="hdlist1"> -guitool.<name>.noconsole +guitool.<name>.noConsole </dt> <dd> <p> @@ -4280,7 +4280,7 @@ </p> </dd> <dt class="hdlist1"> -guitool.<name>.norescan +guitool.<name>.noRescan </dt> <dd> <p> @@ -4297,7 +4297,7 @@ </p> </dd> <dt class="hdlist1"> -guitool.<name>.argprompt +guitool.<name>.argPrompt </dt> <dd> <p> @@ -4310,21 +4310,21 @@ </p> </dd> <dt class="hdlist1"> -guitool.<name>.revprompt +guitool.<name>.revPrompt </dt> <dd> <p> Request a single valid revision from the user, and set the <em>REVISION</em> environment variable. In other aspects this option - is similar to <em>argprompt</em>, and can be used together with it. + is similar to <em>argPrompt</em>, and can be used together with it. </p> </dd> <dt class="hdlist1"> -guitool.<name>.revunmerged +guitool.<name>.revUnmerged </dt> <dd> <p> - Show only unmerged branches in the <em>revprompt</em> subdialog. + Show only unmerged branches in the <em>revPrompt</em> subdialog. This is useful for tools similar to merge or rebase, but not for things like checkout or reset. </p> @@ -4344,7 +4344,7 @@ <dd> <p> Specifies the general prompt string to display at the top of - the dialog, before subsections for <em>argprompt</em> and <em>revprompt</em>. + the dialog, before subsections for <em>argPrompt</em> and <em>revPrompt</em>. The default value includes the actual command. </p> </dd> @@ -4368,7 +4368,7 @@ </p> </dd> <dt class="hdlist1"> -help.autocorrect +help.autoCorrect </dt> <dd> <p> @@ -4382,7 +4382,7 @@ </p> </dd> <dt class="hdlist1"> -help.htmlpath +help.htmlPath </dt> <dd> <p> @@ -4404,7 +4404,7 @@ </p> </dd> <dt class="hdlist1"> -http.cookiefile +http.cookieFile </dt> <dd> <p> @@ -4412,17 +4412,17 @@ in the Git http session, if they match the server. The file format of the file to read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie file format (see <a href="curl.html">curl(1)</a>). - NOTE that the file specified with http.cookiefile is only used as + NOTE that the file specified with http.cookieFile is only used as input unless http.saveCookies is set. </p> </dd> <dt class="hdlist1"> -http.savecookies +http.saveCookies </dt> <dd> <p> If set, store cookies received during requests to the file specified by - http.cookiefile. Has no effect if http.cookiefile is unset. + http.cookieFile. Has no effect if http.cookieFile is unset. </p> </dd> <dt class="hdlist1"> @@ -4555,7 +4555,7 @@ </p> </dd> <dt class="hdlist1"> -http.useragent +http.userAgent </dt> <dd> <p> @@ -4674,7 +4674,7 @@ </p> </dd> <dt class="hdlist1"> -init.templatedir +init.templateDir </dt> <dd> <p> @@ -4710,7 +4710,7 @@ </p> </dd> <dt class="hdlist1"> -instaweb.modulepath +instaweb.modulePath </dt> <dd> <p> @@ -4729,7 +4729,7 @@ </p> </dd> <dt class="hdlist1"> -interactive.singlekey +interactive.singleKey </dt> <dd> <p> @@ -4777,7 +4777,7 @@ </p> </dd> <dt class="hdlist1"> -log.showroot +log.showRoot </dt> <dd> <p> @@ -4863,7 +4863,7 @@ </p> </dd> <dt class="hdlist1"> -merge.conflictstyle +merge.conflictStyle </dt> <dd> <p> @@ -5407,7 +5407,7 @@ </p> </dd> <dt class="hdlist1"> -pack.writebitmaps (deprecated) +pack.writeBitmaps (deprecated) </dt> <dd> <p> @@ -5584,6 +5584,16 @@ </div></div> </dd> <dt class="hdlist1"> +push.followTags +</dt> +<dd> +<p> + If set to true enable <em>--follow-tags</em> option by default. You + may override this configuration at time of push by specifying + <em>--no-follow-tags</em>. +</p> +</dd> +<dt class="hdlist1"> rebase.stat </dt> <dd> @@ -5593,7 +5603,7 @@ </p> </dd> <dt class="hdlist1"> -rebase.autosquash +rebase.autoSquash </dt> <dd> <p> @@ -5601,7 +5611,7 @@ </p> </dd> <dt class="hdlist1"> -rebase.autostash +rebase.autoStash </dt> <dd> <p> @@ -5614,7 +5624,7 @@ </p> </dd> <dt class="hdlist1"> -receive.advertiseatomic +receive.advertiseAtomic </dt> <dd> <p> @@ -5634,7 +5644,7 @@ </p> </dd> <dt class="hdlist1"> -receive.certnonceseed +receive.certNonceSeed </dt> <dd> <p> @@ -5645,7 +5655,7 @@ </p> </dd> <dt class="hdlist1"> -receive.certnonceslop +receive.certNonceSlop </dt> <dd> <p> @@ -5742,7 +5752,7 @@ </p> </dd> <dt class="hdlist1"> -receive.hiderefs +receive.hideRefs </dt> <dd> <p> @@ -5756,7 +5766,7 @@ </p> </dd> <dt class="hdlist1"> -receive.updateserverinfo +receive.updateServerInfo </dt> <dd> <p> @@ -5765,7 +5775,7 @@ </p> </dd> <dt class="hdlist1"> -receive.shallowupdate +receive.shallowUpdate </dt> <dd> <p> @@ -5774,13 +5784,13 @@ </p> </dd> <dt class="hdlist1"> -remote.pushdefault +remote.pushDefault </dt> <dd> <p> The remote to push to by default. Overrides <code>branch.<name>.remote</code> for all branches, and is overridden by - <code>branch.<name>.pushremote</code> for specific branches. + <code>branch.<name>.pushRemote</code> for specific branches. </p> </dd> <dt class="hdlist1"> @@ -5876,7 +5886,7 @@ </p> </dd> <dt class="hdlist1"> -remote.<name>.tagopt +remote.<name>.tagOpt </dt> <dd> <p> @@ -5918,7 +5928,7 @@ </p> </dd> <dt class="hdlist1"> -repack.usedeltabaseoffset +repack.useDeltaBaseOffset </dt> <dd> <p> @@ -5956,7 +5966,7 @@ </p> </dd> <dt class="hdlist1"> -rerere.autoupdate +rerere.autoUpdate </dt> <dd> <p> @@ -5990,7 +6000,7 @@ </p> </dd> <dt class="hdlist1"> -sendemail.smtpencryption +sendemail.smtpEncryption </dt> <dd> <p> @@ -6003,7 +6013,7 @@ </dt> <dd> <p> - Deprecated alias for <em>sendemail.smtpencryption = ssl</em>. + Deprecated alias for <em>sendemail.smtpEncryption = ssl</em>. </p> </dd> <dt class="hdlist1"> @@ -6027,10 +6037,10 @@ </p> </dd> <dt class="hdlist1"> -sendemail.aliasesfile +sendemail.aliasesFile </dt> <dt class="hdlist1"> -sendemail.aliasfiletype +sendemail.aliasFileType </dt> <dt class="hdlist1"> sendemail.annotate @@ -6042,58 +6052,58 @@ sendemail.cc </dt> <dt class="hdlist1"> -sendemail.cccmd +sendemail.ccCmd </dt> <dt class="hdlist1"> -sendemail.chainreplyto +sendemail.chainReplyTo </dt> <dt class="hdlist1"> sendemail.confirm </dt> <dt class="hdlist1"> -sendemail.envelopesender +sendemail.envelopeSender </dt> <dt class="hdlist1"> sendemail.from </dt> <dt class="hdlist1"> -sendemail.multiedit +sendemail.multiEdit </dt> <dt class="hdlist1"> sendemail.signedoffbycc </dt> <dt class="hdlist1"> -sendemail.smtppass +sendemail.smtpPass </dt> <dt class="hdlist1"> sendemail.suppresscc </dt> <dt class="hdlist1"> -sendemail.suppressfrom +sendemail.suppressFrom </dt> <dt class="hdlist1"> sendemail.to </dt> <dt class="hdlist1"> -sendemail.smtpdomain +sendemail.smtpDomain </dt> <dt class="hdlist1"> -sendemail.smtpserver +sendemail.smtpServer </dt> <dt class="hdlist1"> -sendemail.smtpserverport +sendemail.smtpServerPort </dt> <dt class="hdlist1"> -sendemail.smtpserveroption +sendemail.smtpServerOption </dt> <dt class="hdlist1"> -sendemail.smtpuser +sendemail.smtpUser </dt> <dt class="hdlist1"> sendemail.thread </dt> <dt class="hdlist1"> -sendemail.transferencoding +sendemail.transferEncoding </dt> <dt class="hdlist1"> sendemail.validate @@ -6202,7 +6212,7 @@ of <a href="git-status.html">git-status(1)</a> and <a href="git-commit.html">git-commit(1)</a>.</p></div> </dd> <dt class="hdlist1"> -status.submodulesummary +status.submoduleSummary </dt> <dd> <p> @@ -6324,12 +6334,12 @@ </p> </dd> <dt class="hdlist1"> -transfer.hiderefs +transfer.hideRefs </dt> <dd> <p> - This variable can be used to set both <code>receive.hiderefs</code> - and <code>uploadpack.hiderefs</code> at the same time to the same + This variable can be used to set both <code>receive.hideRefs</code> + and <code>uploadpack.hideRefs</code> at the same time to the same values. See entries for these other variables. </p> </dd> @@ -6356,7 +6366,7 @@ </p> </dd> <dt class="hdlist1"> -uploadpack.hiderefs +uploadpack.hideRefs </dt> <dd> <p> @@ -6374,14 +6384,14 @@ </dt> <dd> <p> - When <code>uploadpack.hiderefs</code> is in effect, allow <code>upload-pack</code> + When <code>uploadpack.hideRefs</code> is in effect, allow <code>upload-pack</code> to accept a fetch request that asks for an object at the tip of a hidden ref (by default, such a request is rejected). - see also <code>uploadpack.hiderefs</code>. + see also <code>uploadpack.hideRefs</code>. </p> </dd> <dt class="hdlist1"> -uploadpack.keepalive +uploadpack.keepAlive </dt> <dd> <p> @@ -6392,7 +6402,7 @@ the pack data begins. Some clients and networks may consider the server to be hung and give up. Setting this option instructs <code>upload-pack</code> to send an empty keepalive packet every - <code>uploadpack.keepalive</code> seconds. Setting this option to 0 + <code>uploadpack.keepAlive</code> seconds. Setting this option to 0 disables keepalive packets entirely. The default is 5 seconds. </p> </dd> @@ -6451,7 +6461,7 @@ </p> </dd> <dt class="hdlist1"> -user.signingkey +user.signingKey </dt> <dd> <p> @@ -6502,7 +6512,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-06-06 12:15:38 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-config.txt b/git-config.txt index 9dfa1a5..02ec096 100644 --- a/git-config.txt +++ b/git-config.txt
@@ -405,7 +405,7 @@ % git config --bool --get-urlmatch http.sslverify https://weak.example.com false % git config --get-urlmatch http https://weak.example.com -http.cookiefile /tmp/cookie.txt +http.cookieFile /tmp/cookie.txt http.sslverify false ------------
diff --git a/git-cvsserver.html b/git-cvsserver.html index dbdc0ed..a1fdcac 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html
@@ -936,7 +936,7 @@ <pre><code> [gitcvs] enabled=1 # optional for debugging - logfile=/path/to/logfile</code></pre> + logFile=/path/to/logfile</code></pre> </div></div> <div class="paragraph"><p>Note: you need to ensure each user that is going to invoke <em>git-cvsserver</em> has write access to the log file and to the database (see @@ -1041,7 +1041,7 @@ about <code>DBI->connect()</code>.</p></div> <div class="dlist"><dl> <dt class="hdlist1"> -gitcvs.dbname +gitcvs.dbName </dt> <dd> <p> @@ -1053,7 +1053,7 @@ </p> </dd> <dt class="hdlist1"> -gitcvs.dbdriver +gitcvs.dbDriver </dt> <dd> <p> @@ -1071,17 +1071,17 @@ </dt> <dd> <p> - Database user. Only useful if setting <code>dbdriver</code>, since + Database user. Only useful if setting <code>dbDriver</code>, since SQLite has no concept of database users. Supports variable substitution (see below). </p> </dd> <dt class="hdlist1"> -gitcvs.dbpass +gitcvs.dbPass </dt> <dd> <p> - Database password. Only useful if setting <code>dbdriver</code>, since + Database password. Only useful if setting <code>dbDriver</code>, since SQLite has no concept of database passwords. </p> </dd> @@ -1099,7 +1099,7 @@ <div class="paragraph"><p>All variables can also be set per access method, see <a href="#configaccessmethod">above</a>.</p></div> <div class="sect3"> <h4 id="_variable_substitution">Variable substitution</h4> -<div class="paragraph"><p>In <code>dbdriver</code> and <code>dbuser</code> you can use the following variables:</p></div> +<div class="paragraph"><p>In <code>dbDriver</code> and <code>dbUser</code> you can use the following variables:</p></div> <div class="dlist"><dl> <dt class="hdlist1"> %G @@ -1283,15 +1283,15 @@ about end-of-line conversion.</p></div> <div class="paragraph"><p>Alternatively, if <code>gitcvs.usecrlfattr</code> config is not enabled or the attributes do not allow automatic detection for a filename, then -the server uses the <code>gitcvs.allbinary</code> config for the default setting. -If <code>gitcvs.allbinary</code> is set, then file not otherwise +the server uses the <code>gitcvs.allBinary</code> config for the default setting. +If <code>gitcvs.allBinary</code> is set, then file not otherwise specified will default to <em>-kb</em> mode. Otherwise the <em>-k</em> mode -is left blank. But if <code>gitcvs.allbinary</code> is set to "guess", then +is left blank. But if <code>gitcvs.allBinary</code> is set to "guess", then the correct <em>-k</em> mode will be guessed based on the contents of the file.</p></div> <div class="paragraph"><p>For best consistency with <em>cvs</em>, it is probably best to override the defaults by setting <code>gitcvs.usecrlfattr</code> to true, -and <code>gitcvs.allbinary</code> to "guess".</p></div> +and <code>gitcvs.allBinary</code> to "guess".</p></div> </div> </div> </div> @@ -1311,7 +1311,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-11-04 14:37:41 PST +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-cvsserver.txt b/git-cvsserver.txt index 4961f1a..db4d7a9 100644 --- a/git-cvsserver.txt +++ b/git-cvsserver.txt
@@ -154,7 +154,7 @@ [gitcvs] enabled=1 # optional for debugging - logfile=/path/to/logfile + logFile=/path/to/logfile ------ Note: you need to ensure each user that is going to invoke 'git-cvsserver' has @@ -254,14 +254,14 @@ its documentation if changing these variables, especially about `DBI->connect()`. -gitcvs.dbname:: +gitcvs.dbName:: Database name. The exact meaning depends on the selected database driver, for SQLite this is a filename. Supports variable substitution (see below). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite' -gitcvs.dbdriver:: +gitcvs.dbDriver:: Used DBI driver. You can specify any available driver for this here, but it might not work. cvsserver is tested with 'DBD::SQLite', reported to work with @@ -271,12 +271,12 @@ Default: 'SQLite' gitcvs.dbuser:: - Database user. Only useful if setting `dbdriver`, since + Database user. Only useful if setting `dbDriver`, since SQLite has no concept of database users. Supports variable substitution (see below). -gitcvs.dbpass:: - Database password. Only useful if setting `dbdriver`, since +gitcvs.dbPass:: + Database password. Only useful if setting `dbDriver`, since SQLite has no concept of database passwords. gitcvs.dbTableNamePrefix:: @@ -288,7 +288,7 @@ Variable substitution ^^^^^^^^^^^^^^^^^^^^^ -In `dbdriver` and `dbuser` you can use the following variables: +In `dbDriver` and `dbUser` you can use the following variables: %G:: Git directory name @@ -413,16 +413,16 @@ Alternatively, if `gitcvs.usecrlfattr` config is not enabled or the attributes do not allow automatic detection for a filename, then -the server uses the `gitcvs.allbinary` config for the default setting. -If `gitcvs.allbinary` is set, then file not otherwise +the server uses the `gitcvs.allBinary` config for the default setting. +If `gitcvs.allBinary` is set, then file not otherwise specified will default to '-kb' mode. Otherwise the '-k' mode -is left blank. But if `gitcvs.allbinary` is set to "guess", then +is left blank. But if `gitcvs.allBinary` is set to "guess", then the correct '-k' mode will be guessed based on the contents of the file. For best consistency with 'cvs', it is probably best to override the defaults by setting `gitcvs.usecrlfattr` to true, -and `gitcvs.allbinary` to "guess". +and `gitcvs.allBinary` to "guess". Dependencies ------------
diff --git a/git-diff-files.html b/git-diff-files.html index bbd62fc..c6747dd 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -1431,8 +1431,8 @@ <p> Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line. - This overrides the <code>diff.orderfile</code> configuration variable - (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderfile</code>, + This overrides the <code>diff.orderFile</code> configuration variable + (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderFile</code>, use <code>-O/dev/null</code>. </p> </dd>
diff --git a/git-diff-index.html b/git-diff-index.html index 79c1bd7..a16e188 100644 --- a/git-diff-index.html +++ b/git-diff-index.html
@@ -1432,8 +1432,8 @@ <p> Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line. - This overrides the <code>diff.orderfile</code> configuration variable - (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderfile</code>, + This overrides the <code>diff.orderFile</code> configuration variable + (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderFile</code>, use <code>-O/dev/null</code>. </p> </dd>
diff --git a/git-diff-tree.html b/git-diff-tree.html index f8697f9..194ae7b 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -1433,8 +1433,8 @@ <p> Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line. - This overrides the <code>diff.orderfile</code> configuration variable - (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderfile</code>, + This overrides the <code>diff.orderFile</code> configuration variable + (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderFile</code>, use <code>-O/dev/null</code>. </p> </dd>
diff --git a/git-diff.html b/git-diff.html index 1407b15..c7f5508 100644 --- a/git-diff.html +++ b/git-diff.html
@@ -1542,8 +1542,8 @@ <p> Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line. - This overrides the <code>diff.orderfile</code> configuration variable - (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderfile</code>, + This overrides the <code>diff.orderFile</code> configuration variable + (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderFile</code>, use <code>-O/dev/null</code>. </p> </dd>
diff --git a/git-fetch.html b/git-fetch.html index 9582e4d..6049b05 100644 --- a/git-fetch.html +++ b/git-fetch.html
@@ -767,7 +767,7 @@ also fetched; the effect is to fetch tags that point at branches that you are interested in. This default behavior can be changed by using the --tags or --no-tags options or by -configuring remote.<name>.tagopt. By using a refspec that fetches tags +configuring remote.<name>.tagOpt. By using a refspec that fetches tags explicitly, you can fetch tags that do not point into branches you are interested in as well.</p></div> <div class="paragraph"><p><em>git fetch</em> can fetch from either a single named repository or URL, @@ -912,7 +912,7 @@ By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following. The default - behavior for a remote may be specified with the remote.<name>.tagopt + behavior for a remote may be specified with the remote.<name>.tagOpt setting. See <a href="git-config.html">git-config(1)</a>. </p> </dd> @@ -1480,7 +1480,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-06-20 15:24:28 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-fetch.txt b/git-fetch.txt index 8deb614..e62d9a0 100644 --- a/git-fetch.txt +++ b/git-fetch.txt
@@ -26,7 +26,7 @@ also fetched; the effect is to fetch tags that point at branches that you are interested in. This default behavior can be changed by using the --tags or --no-tags options or by -configuring remote.<name>.tagopt. By using a refspec that fetches tags +configuring remote.<name>.tagOpt. By using a refspec that fetches tags explicitly, you can fetch tags that do not point into branches you are interested in as well.
diff --git a/git-format-patch.html b/git-format-patch.html index 1b0bf44..ce2f09c 100644 --- a/git-format-patch.html +++ b/git-format-patch.html
@@ -1216,8 +1216,8 @@ <p> Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line. - This overrides the <code>diff.orderfile</code> configuration variable - (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderfile</code>, + This overrides the <code>diff.orderFile</code> configuration variable + (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderFile</code>, use <code>-O/dev/null</code>. </p> </dd> @@ -1733,13 +1733,13 @@ <div class="content"> <pre><code>[format] headers = "Organization: git-foo\n" - subjectprefix = CHANGE + subjectPrefix = CHANGE suffix = .txt numbered = auto to = <email> cc = <email> attach [ = mime-boundary-string ] - signoff = true + signOff = true coverletter = auto</code></pre> </div></div> </div> @@ -2114,7 +2114,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-06-16 14:13:22 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-format-patch.txt b/git-format-patch.txt index c0fd470..bb3ea93 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt
@@ -273,13 +273,13 @@ ------------ [format] headers = "Organization: git-foo\n" - subjectprefix = CHANGE + subjectPrefix = CHANGE suffix = .txt numbered = auto to = <email> cc = <email> attach [ = mime-boundary-string ] - signoff = true + signOff = true coverletter = auto ------------
diff --git a/git-gc.html b/git-gc.html index d59e108..e4d6161 100644 --- a/git-gc.html +++ b/git-gc.html
@@ -805,10 +805,10 @@ all loose objects are combined into a single pack using <code>git repack -d -l</code>. Setting the value of <code>gc.auto</code> to 0 disables automatic packing of loose objects.</p></div> -<div class="paragraph"><p>If the number of packs exceeds the value of <code>gc.autopacklimit</code>, +<div class="paragraph"><p>If the number of packs exceeds the value of <code>gc.autoPackLimit</code>, then existing packs (except those marked with a <code>.keep</code> file) are consolidated into a single pack by using the <code>-A</code> option of -<em>git repack</em>. Setting <code>gc.autopacklimit</code> to 0 disables +<em>git repack</em>. Setting <code>gc.autoPackLimit</code> to 0 disables automatic consolidation of packs.</p></div> </dd> <dt class="hdlist1"> @@ -873,15 +873,15 @@ <div class="content"> <pre><code>[gc "refs/remotes/*"] reflogExpire = never - reflogexpireUnreachable = 3 days</code></pre> + reflogExpireUnreachable = 3 days</code></pre> </div></div> -<div class="paragraph"><p>The optional configuration variable <em>gc.rerereresolved</em> indicates +<div class="paragraph"><p>The optional configuration variable <em>gc.rerereResolved</em> indicates how long records of conflicted merge you resolved earlier are kept. This defaults to 60 days.</p></div> -<div class="paragraph"><p>The optional configuration variable <em>gc.rerereunresolved</em> indicates +<div class="paragraph"><p>The optional configuration variable <em>gc.rerereUnresolved</em> indicates how long records of conflicted merge you have not resolved are kept. This defaults to 15 days.</p></div> -<div class="paragraph"><p>The optional configuration variable <em>gc.packrefs</em> determines if +<div class="paragraph"><p>The optional configuration variable <em>gc.packRefs</em> determines if <em>git gc</em> runs <em>git pack-refs</em>. This can be set to "notbare" to enable it within all non-bare repos or it can be set to a boolean value. This defaults to true.</p></div> @@ -938,7 +938,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-04-03 14:56:03 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-gc.txt b/git-gc.txt index 273c466..5223498 100644 --- a/git-gc.txt +++ b/git-gc.txt
@@ -54,10 +54,10 @@ `git repack -d -l`. Setting the value of `gc.auto` to 0 disables automatic packing of loose objects. + -If the number of packs exceeds the value of `gc.autopacklimit`, +If the number of packs exceeds the value of `gc.autoPackLimit`, then existing packs (except those marked with a `.keep` file) are consolidated into a single pack by using the `-A` option of -'git repack'. Setting `gc.autopacklimit` to 0 disables +'git repack'. Setting `gc.autoPackLimit` to 0 disables automatic consolidation of packs. --prune=<date>:: @@ -101,18 +101,18 @@ ------------ [gc "refs/remotes/*"] reflogExpire = never - reflogexpireUnreachable = 3 days + reflogExpireUnreachable = 3 days ------------ -The optional configuration variable 'gc.rerereresolved' indicates +The optional configuration variable 'gc.rerereResolved' indicates how long records of conflicted merge you resolved earlier are kept. This defaults to 60 days. -The optional configuration variable 'gc.rerereunresolved' indicates +The optional configuration variable 'gc.rerereUnresolved' indicates how long records of conflicted merge you have not resolved are kept. This defaults to 15 days. -The optional configuration variable 'gc.packrefs' determines if +The optional configuration variable 'gc.packRefs' determines if 'git gc' runs 'git pack-refs'. This can be set to "notbare" to enable it within all non-bare repos or it can be set to a boolean value. This defaults to true.
diff --git a/git-init.html b/git-init.html index b51d235..02dd2b0 100644 --- a/git-init.html +++ b/git-init.html
@@ -911,7 +911,7 @@ </li> <li> <p> -the <code>init.templatedir</code> configuration variable; or +the <code>init.templateDir</code> configuration variable; or </p> </li> <li> @@ -970,7 +970,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-09-09 14:15:21 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-init.txt b/git-init.txt index 369f889..8174d27 100644 --- a/git-init.txt +++ b/git-init.txt
@@ -125,7 +125,7 @@ - the contents of the `$GIT_TEMPLATE_DIR` environment variable; - - the `init.templatedir` configuration variable; or + - the `init.templateDir` configuration variable; or - the default template directory: `/usr/share/git-core/templates`.
diff --git a/git-instaweb.html b/git-instaweb.html index 9f247ca..be622ed 100644 --- a/git-instaweb.html +++ b/git-instaweb.html
@@ -881,7 +881,7 @@ httpd = apache2 -f port = 4321 browser = konqueror - modulepath = /usr/lib/apache2/modules</code></pre> + modulePath = /usr/lib/apache2/modules</code></pre> </div></div> <div class="paragraph"><p>If the configuration variable <em>instaweb.browser</em> is not set, <em>web.browser</em> will be used instead if it is defined. See @@ -904,7 +904,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-20 08:40:27 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-instaweb.txt b/git-instaweb.txt index f3eef51..cc75b25 100644 --- a/git-instaweb.txt +++ b/git-instaweb.txt
@@ -76,7 +76,7 @@ httpd = apache2 -f port = 4321 browser = konqueror - modulepath = /usr/lib/apache2/modules + modulePath = /usr/lib/apache2/modules -----------------------------------------------------------------------
diff --git a/git-log.html b/git-log.html index 29ca3b4..9ee3a0f 100644 --- a/git-log.html +++ b/git-log.html
@@ -3334,8 +3334,8 @@ <p> Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line. - This overrides the <code>diff.orderfile</code> configuration variable - (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderfile</code>, + This overrides the <code>diff.orderFile</code> configuration variable + (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderFile</code>, use <code>-O/dev/null</code>. </p> </dd> @@ -3946,7 +3946,7 @@ </p> </dd> <dt class="hdlist1"> -log.showroot +log.showRoot </dt> <dd> <p> @@ -3994,7 +3994,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-12-03 14:06:33 PST +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-log.txt b/git-log.txt index 1f7bc67..18bc716 100644 --- a/git-log.txt +++ b/git-log.txt
@@ -184,7 +184,7 @@ `--date` option.) Defaults to "default", which means to write dates like `Sat May 8 19:35:34 2010 -0500`. -log.showroot:: +log.showRoot:: If `false`, `git log` and related commands will not treat the initial commit as a big creation event. Any root commits in `git log -p` output would be shown without a diff attached.
diff --git a/git-merge.html b/git-merge.html index 61aea9c..af27574 100644 --- a/git-merge.html +++ b/git-merge.html
@@ -1215,7 +1215,7 @@ Barbie’s remark on your side. The only thing you can tell is that your side wants to say it is hard and you’d prefer to go shopping, while the other side wants to claim it is easy.</p></div> -<div class="paragraph"><p>An alternative style can be used by setting the "merge.conflictstyle" +<div class="paragraph"><p>An alternative style can be used by setting the "merge.conflictStyle" configuration variable to "diff3". In "diff3" style, the above conflict may look like this:</p></div> <div class="listingblock"> @@ -1554,7 +1554,7 @@ <div class="sectionbody"> <div class="dlist"><dl> <dt class="hdlist1"> -merge.conflictstyle +merge.conflictStyle </dt> <dd> <p> @@ -1806,7 +1806,7 @@ </p> </dd> <dt class="hdlist1"> -branch.<name>.mergeoptions +branch.<name>.mergeOptions </dt> <dd> <p> @@ -1839,7 +1839,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-06-03 15:14:46 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-merge.txt b/git-merge.txt index cf2c374..1f94908 100644 --- a/git-merge.txt +++ b/git-merge.txt
@@ -232,7 +232,7 @@ side wants to say it is hard and you'd prefer to go shopping, while the other side wants to claim it is easy. -An alternative style can be used by setting the "merge.conflictstyle" +An alternative style can be used by setting the "merge.conflictStyle" configuration variable to "diff3". In "diff3" style, the above conflict may look like this: @@ -329,7 +329,7 @@ ------------- include::merge-config.txt[] -branch.<name>.mergeoptions:: +branch.<name>.mergeOptions:: Sets default options for merging into branch <name>. The syntax and supported options are the same as those of 'git merge', but option values containing whitespace characters are currently not supported.
diff --git a/git-pull.html b/git-pull.html index 5bcacfb..20eaa08 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -1041,7 +1041,7 @@ branch, but pass <code>--preserve-merges</code> along to <code>git rebase</code> so that locally created merge commits will not be flattened.</p></div> <div class="paragraph"><p>When false, merge the current branch into the upstream branch.</p></div> -<div class="paragraph"><p>See <code>pull.rebase</code>, <code>branch.<name>.rebase</code> and <code>branch.autosetuprebase</code> in +<div class="paragraph"><p>See <code>pull.rebase</code>, <code>branch.<name>.rebase</code> and <code>branch.autoSetupRebase</code> in <a href="git-config.html">git-config(1)</a> if you want to make <code>git pull</code> always use <code>--rebase</code> instead of merging.</p></div> <div class="admonitionblock"> @@ -1158,7 +1158,7 @@ By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following. The default - behavior for a remote may be specified with the remote.<name>.tagopt + behavior for a remote may be specified with the remote.<name>.tagOpt setting. See <a href="git-config.html">git-config(1)</a>. </p> </dd> @@ -1848,7 +1848,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-01-27 13:30:07 PST +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-pull.txt b/git-pull.txt index 200eb22..d3d236c 100644 --- a/git-pull.txt +++ b/git-pull.txt
@@ -117,7 +117,7 @@ + When false, merge the current branch into the upstream branch. + -See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in +See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging. +
diff --git a/git-push.html b/git-push.html index b57e2b1..514e6a3 100644 --- a/git-push.html +++ b/git-push.html
@@ -914,7 +914,9 @@ Push all the refs that would be pushed without this option, and also push annotated tags in <code>refs/tags</code> that are missing from the remote but are pointing at commit-ish that are - reachable from the refs being pushed. + reachable from the refs being pushed. This can also be specified + with configuration variable <em>push.followTags</em>. For more + information, see <em>push.followTags</em> in <a href="git-config.html">git-config(1)</a>. </p> </dd> <dt class="hdlist1"> @@ -1740,7 +1742,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-02-17 14:10:17 PST +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-push.txt b/git-push.txt index e1a46a7..5171086 100644 --- a/git-push.txt +++ b/git-push.txt
@@ -128,7 +128,10 @@ Push all the refs that would be pushed without this option, and also push annotated tags in `refs/tags` that are missing from the remote but are pointing at commit-ish that are - reachable from the refs being pushed. + reachable from the refs being pushed. This can also be specified + with configuration variable 'push.followTags'. For more + information, see 'push.followTags' in linkgit:git-config[1]. + --signed:: GPG-sign the push request to update refs on the receiving
diff --git a/git-rebase.html b/git-rebase.html index 0e2ab2a..bd225e9 100644 --- a/git-rebase.html +++ b/git-rebase.html
@@ -940,7 +940,7 @@ </p> </dd> <dt class="hdlist1"> -rebase.autosquash +rebase.autoSquash </dt> <dd> <p> @@ -948,7 +948,7 @@ </p> </dd> <dt class="hdlist1"> -rebase.autostash +rebase.autoStash </dt> <dd> <p> @@ -1322,7 +1322,7 @@ </p> <div class="paragraph"><p>This option is only valid when the <em>--interactive</em> option is used.</p></div> <div class="paragraph"><p>If the <em>--autosquash</em> option is enabled by default using the -configuration variable <code>rebase.autosquash</code>, this option can be +configuration variable <code>rebase.autoSquash</code>, this option can be used to override and disable this setting.</p></div> </dd> <dt class="hdlist1"> @@ -1973,7 +1973,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-10-14 15:27:06 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-rebase.txt b/git-rebase.txt index 924827d..d728030 100644 --- a/git-rebase.txt +++ b/git-rebase.txt
@@ -207,10 +207,10 @@ Whether to show a diffstat of what changed upstream since the last rebase. False by default. -rebase.autosquash:: +rebase.autoSquash:: If set to true enable '--autosquash' option by default. -rebase.autostash:: +rebase.autoStash:: If set to true enable '--autostash' option by default. OPTIONS @@ -414,7 +414,7 @@ This option is only valid when the '--interactive' option is used. + If the '--autosquash' option is enabled by default using the -configuration variable `rebase.autosquash`, this option can be +configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting. --[no-]autostash::
diff --git a/git-receive-pack.html b/git-receive-pack.html index a3b9629..c2682f0 100644 --- a/git-receive-pack.html +++ b/git-receive-pack.html
@@ -910,7 +910,7 @@ starting time is different by this many seconds from the current session. Only meaningful when <code>GIT_PUSH_CERT_NONCE_STATUS</code> says <code>SLOP</code>. - Also read about <code>receive.certnonceslop</code> variable in + Also read about <code>receive.certNonceSlop</code> variable in <a href="git-config.html">git-config(1)</a>. </p> </dd> @@ -1042,7 +1042,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-10-14 15:27:06 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-receive-pack.txt b/git-receive-pack.txt index 9016960..000ee8d 100644 --- a/git-receive-pack.txt +++ b/git-receive-pack.txt
@@ -100,7 +100,7 @@ starting time is different by this many seconds from the current session. Only meaningful when `GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`. - Also read about `receive.certnonceslop` variable in + Also read about `receive.certNonceSlop` variable in linkgit:git-config[1]. This hook is called before any refname is updated and before any
diff --git a/git-repack.html b/git-repack.html index 23f5bfb..a8cc4f4 100644 --- a/git-repack.html +++ b/git-repack.html
@@ -919,7 +919,7 @@ Write a reachability bitmap index as part of the repack. This only makes sense when used with <code>-a</code> or <code>-A</code>, as the bitmaps must be able to refer to all reachable objects. This option - overrides the setting of <code>pack.writebitmaps</code>. + overrides the setting of <code>pack.writeBitmaps</code>. </p> </dd> <dt class="hdlist1"> @@ -932,7 +932,7 @@ This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches. This option is generally only useful if you are writing bitmaps - with <code>-b</code> or <code>pack.writebitmaps</code>, as it ensures that the + with <code>-b</code> or <code>pack.writeBitmaps</code>, as it ensures that the bitmapped packfile has the necessary objects. </p> </dd> @@ -970,7 +970,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-03-18 15:05:44 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-repack.txt b/git-repack.txt index 4786a78..0e0bd36 100644 --- a/git-repack.txt +++ b/git-repack.txt
@@ -115,7 +115,7 @@ Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option - overrides the setting of `pack.writebitmaps`. + overrides the setting of `pack.writeBitmaps`. --pack-kept-objects:: Include objects in `.keep` files when repacking. Note that we @@ -123,7 +123,7 @@ This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches. This option is generally only useful if you are writing bitmaps - with `-b` or `pack.writebitmaps`, as it ensures that the + with `-b` or `pack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects. Configuration
diff --git a/git-rerere.html b/git-rerere.html index 18bb84c..d9dcd4c 100644 --- a/git-rerere.html +++ b/git-rerere.html
@@ -839,7 +839,7 @@ occurred a long time ago. By default, unresolved conflicts older than 15 days and resolved conflicts older than 60 days are pruned. These defaults are controlled via the -<code>gc.rerereunresolved</code> and <code>gc.rerereresolved</code> configuration +<code>gc.rerereUnresolved</code> and <code>gc.rerereResolved</code> configuration variables respectively. </p> </dd> @@ -983,7 +983,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-20 08:40:27 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-rerere.txt b/git-rerere.txt index a62227f..9ee083c 100644 --- a/git-rerere.txt +++ b/git-rerere.txt
@@ -69,7 +69,7 @@ occurred a long time ago. By default, unresolved conflicts older than 15 days and resolved conflicts older than 60 days are pruned. These defaults are controlled via the -`gc.rerereunresolved` and `gc.rerereresolved` configuration +`gc.rerereUnresolved` and `gc.rerereResolved` configuration variables respectively.
diff --git a/git-send-email.html b/git-send-email.html index ba4fd5a..0e0add7 100644 --- a/git-send-email.html +++ b/git-send-email.html
@@ -797,7 +797,7 @@ <p> Review and edit each patch you’re about to send. Default is the value of <em>sendemail.annotate</em>. See the CONFIGURATION section for - <em>sendemail.multiedit</em>. + <em>sendemail.multiEdit</em>. </p> </dd> <dt class="hdlist1"> @@ -834,7 +834,7 @@ (or Git: prefixed) lines, the summary won’t be sent, but From, Subject, and In-Reply-To headers will be used unless they are removed.</p></div> <div class="paragraph"><p>Missing From or In-Reply-To headers will be prompted for.</p></div> -<div class="paragraph"><p>See the CONFIGURATION section for <em>sendemail.multiedit</em>.</p></div> +<div class="paragraph"><p>See the CONFIGURATION section for <em>sendemail.multiEdit</em>.</p></div> </dd> <dt class="hdlist1"> --from=<address> @@ -963,7 +963,7 @@ subscribed to a list. In order to use the <em>From</em> address, set the value to "auto". If you use the sendmail binary, you must have suitable privileges for the -f parameter. Default is the value of the - <em>sendemail.envelopesender</em> configuration variable; if that is + <em>sendemail.envelopeSender</em> configuration variable; if that is unspecified, choosing the envelope sender is left to your MTA. </p> </dd> @@ -974,7 +974,7 @@ <p> Specify the encryption to use, either <em>ssl</em> or <em>tls</em>. Any other value reverts to plain SMTP. Default is the value of - <em>sendemail.smtpencryption</em>. + <em>sendemail.smtpEncryption</em>. </p> </dd> <dt class="hdlist1"> @@ -986,7 +986,7 @@ HELO/EHLO command to the SMTP server. Some servers require the FQDN to match your IP address. If not set, git send-email attempts to determine your FQDN automatically. Default is the value of - <em>sendemail.smtpdomain</em>. + <em>sendemail.smtpDomain</em>. </p> </dd> <dt class="hdlist1"> @@ -996,13 +996,13 @@ <p> Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as - the password. Default is the value of <em>sendemail.smtppass</em>, + the password. Default is the value of <em>sendemail.smtpPass</em>, however <em>--smtp-pass</em> always overrides this value. </p> <div class="paragraph"><p>Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with -<em>--smtp-user</em> or a <em>sendemail.smtpuser</em>), but no password has been -specified (with <em>--smtp-pass</em> or <em>sendemail.smtppass</em>), then +<em>--smtp-user</em> or a <em>sendemail.smtpUser</em>), but no password has been +specified (with <em>--smtp-pass</em> or <em>sendemail.smtpPass</em>), then a password is obtained using <em>git-credential</em>.</p></div> </dd> <dt class="hdlist1"> @@ -1014,7 +1014,7 @@ <code>smtp.example.com</code> or a raw IP address). Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the <code>-i</code> option. Default value can - be specified by the <em>sendemail.smtpserver</em> configuration + be specified by the <em>sendemail.smtpServer</em> configuration option; the built-in default is <code>/usr/sbin/sendmail</code> or <code>/usr/lib/sendmail</code> if such program is available, or <code>localhost</code> otherwise. @@ -1030,7 +1030,7 @@ submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. "submission" instead of 587) are also accepted. The port can also be set with the - <em>sendemail.smtpserverport</em> configuration variable. + <em>sendemail.smtpServerPort</em> configuration variable. </p> </dd> <dt class="hdlist1"> @@ -1039,7 +1039,7 @@ <dd> <p> If set, specifies the outgoing SMTP server option to use. - Default value can be specified by the <em>sendemail.smtpserveroption</em> + Default value can be specified by the <em>sendemail.smtpServerOption</em> configuration option. </p> <div class="paragraph"><p>The --smtp-server-option option must be repeated for each option you want @@ -1075,8 +1075,8 @@ </dt> <dd> <p> - Username for SMTP-AUTH. Default is the value of <em>sendemail.smtpuser</em>; - if a username is not specified (with <em>--smtp-user</em> or <em>sendemail.smtpuser</em>), + Username for SMTP-AUTH. Default is the value of <em>sendemail.smtpUser</em>; + if a username is not specified (with <em>--smtp-user</em> or <em>sendemail.smtpUser</em>), then authentication is not attempted. </p> </dd> @@ -1114,7 +1114,7 @@ Specify a command to execute once per patch file which should generate patch file specific "Cc:" entries. Output of this command must be single email address per line. - Default is the value of <em>sendemail.cccmd</em> configuration value. + Default is the value of <em>sendemail.ccCmd</em> configuration value. </p> </dd> <dt class="hdlist1"> @@ -1126,7 +1126,7 @@ email sent. If disabled with "--no-chain-reply-to", all emails after the first will be sent as replies to the first email sent. When using this, it is recommended that the first file given be an overview of the - entire patch series. Disabled by default, but the <em>sendemail.chainreplyto</em> + entire patch series. Disabled by default, but the <em>sendemail.chainReplyTo</em> configuration variable can be used to enable it. </p> </dd> @@ -1239,7 +1239,7 @@ <dd> <p> If this is set, do not add the From: address to the cc: list. - Default is the value of <em>sendemail.suppressfrom</em> configuration + Default is the value of <em>sendemail.suppressFrom</em> configuration value; if that is unspecified, default to --no-suppress-from. </p> </dd> @@ -1378,25 +1378,25 @@ <div class="sectionbody"> <div class="dlist"><dl> <dt class="hdlist1"> -sendemail.aliasesfile +sendemail.aliasesFile </dt> <dd> <p> To avoid typing long email addresses, point this to one or more - email aliases files. You must also supply <em>sendemail.aliasfiletype</em>. + email aliases files. You must also supply <em>sendemail.aliasFileType</em>. </p> </dd> <dt class="hdlist1"> -sendemail.aliasfiletype +sendemail.aliasFileType </dt> <dd> <p> - Format of the file(s) specified in sendemail.aliasesfile. Must be + Format of the file(s) specified in sendemail.aliasesFile. Must be one of <em>mutt</em>, <em>mailrc</em>, <em>pine</em>, <em>elm</em>, or <em>gnus</em>. </p> </dd> <dt class="hdlist1"> -sendemail.multiedit +sendemail.multiEdit </dt> <dd> <p> @@ -1429,10 +1429,10 @@ <div class="literalblock"> <div class="content"> <pre><code>[sendemail] - smtpencryption = tls - smtpserver = smtp.gmail.com - smtpuser = yourname@gmail.com - smtpserverport = 587</code></pre> + smtpEncryption = tls + smtpServer = smtp.gmail.com + smtpUser = yourname@gmail.com + smtpServerPort = 587</code></pre> </div></div> <div class="paragraph"><p>Once your commits are ready to be sent to the mailing list, run the following commands:</p></div> @@ -1463,7 +1463,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-01-14 14:00:12 PST +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-send-email.txt b/git-send-email.txt index f248a86..8045546 100644 --- a/git-send-email.txt +++ b/git-send-email.txt
@@ -47,7 +47,7 @@ --annotate:: Review and edit each patch you're about to send. Default is the value of 'sendemail.annotate'. See the CONFIGURATION section for - 'sendemail.multiedit'. + 'sendemail.multiEdit'. --bcc=<address>:: Specify a "Bcc:" value for each email. Default is the value of @@ -73,7 +73,7 @@ + Missing From or In-Reply-To headers will be prompted for. + -See the CONFIGURATION section for 'sendemail.multiedit'. +See the CONFIGURATION section for 'sendemail.multiEdit'. --from=<address>:: Specify the sender of the emails. If not specified on the command line, @@ -156,31 +156,31 @@ subscribed to a list. In order to use the 'From' address, set the value to "auto". If you use the sendmail binary, you must have suitable privileges for the -f parameter. Default is the value of the - 'sendemail.envelopesender' configuration variable; if that is + 'sendemail.envelopeSender' configuration variable; if that is unspecified, choosing the envelope sender is left to your MTA. --smtp-encryption=<encryption>:: Specify the encryption to use, either 'ssl' or 'tls'. Any other value reverts to plain SMTP. Default is the value of - 'sendemail.smtpencryption'. + 'sendemail.smtpEncryption'. --smtp-domain=<FQDN>:: Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server. Some servers require the FQDN to match your IP address. If not set, git send-email attempts to determine your FQDN automatically. Default is the value of - 'sendemail.smtpdomain'. + 'sendemail.smtpDomain'. --smtp-pass[=<password>]:: Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as - the password. Default is the value of 'sendemail.smtppass', + the password. Default is the value of 'sendemail.smtpPass', however '--smtp-pass' always overrides this value. + Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with -'--smtp-user' or a 'sendemail.smtpuser'), but no password has been -specified (with '--smtp-pass' or 'sendemail.smtppass'), then +'--smtp-user' or a 'sendemail.smtpUser'), but no password has been +specified (with '--smtp-pass' or 'sendemail.smtpPass'), then a password is obtained using 'git-credential'. --smtp-server=<host>:: @@ -188,7 +188,7 @@ `smtp.example.com` or a raw IP address). Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option. Default value can - be specified by the 'sendemail.smtpserver' configuration + be specified by the 'sendemail.smtpServer' configuration option; the built-in default is `/usr/sbin/sendmail` or `/usr/lib/sendmail` if such program is available, or `localhost` otherwise. @@ -199,11 +199,11 @@ submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. "submission" instead of 587) are also accepted. The port can also be set with the - 'sendemail.smtpserverport' configuration variable. + 'sendemail.smtpServerPort' configuration variable. --smtp-server-option=<option>:: If set, specifies the outgoing SMTP server option to use. - Default value can be specified by the 'sendemail.smtpserveroption' + Default value can be specified by the 'sendemail.smtpServerOption' configuration option. + The --smtp-server-option option must be repeated for each option you want @@ -225,8 +225,8 @@ be the best choice on most platforms). --smtp-user=<user>:: - Username for SMTP-AUTH. Default is the value of 'sendemail.smtpuser'; - if a username is not specified (with '--smtp-user' or 'sendemail.smtpuser'), + Username for SMTP-AUTH. Default is the value of 'sendemail.smtpUser'; + if a username is not specified (with '--smtp-user' or 'sendemail.smtpUser'), then authentication is not attempted. --smtp-debug=0|1:: @@ -247,14 +247,14 @@ Specify a command to execute once per patch file which should generate patch file specific "Cc:" entries. Output of this command must be single email address per line. - Default is the value of 'sendemail.cccmd' configuration value. + Default is the value of 'sendemail.ccCmd' configuration value. --[no-]chain-reply-to:: If this is set, each email will be sent as a reply to the previous email sent. If disabled with "--no-chain-reply-to", all emails after the first will be sent as replies to the first email sent. When using this, it is recommended that the first file given be an overview of the - entire patch series. Disabled by default, but the 'sendemail.chainreplyto' + entire patch series. Disabled by default, but the 'sendemail.chainReplyTo' configuration variable can be used to enable it. --identity=<identity>:: @@ -304,7 +304,7 @@ --[no-]suppress-from:: If this is set, do not add the From: address to the cc: list. - Default is the value of 'sendemail.suppressfrom' configuration + Default is the value of 'sendemail.suppressFrom' configuration value; if that is unspecified, default to --no-suppress-from. --[no-]thread:: @@ -377,15 +377,15 @@ CONFIGURATION ------------- -sendemail.aliasesfile:: +sendemail.aliasesFile:: To avoid typing long email addresses, point this to one or more - email aliases files. You must also supply 'sendemail.aliasfiletype'. + email aliases files. You must also supply 'sendemail.aliasFileType'. -sendemail.aliasfiletype:: - Format of the file(s) specified in sendemail.aliasesfile. Must be +sendemail.aliasFileType:: + Format of the file(s) specified in sendemail.aliasesFile. Must be one of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus'. -sendemail.multiedit:: +sendemail.multiEdit:: If true (default), a single editor instance will be spawned to edit files you have to edit (patches when '--annotate' is used, and the summary when '--compose' is used). If false, files will be edited one @@ -404,10 +404,10 @@ edit ~/.gitconfig to specify your account settings: [sendemail] - smtpencryption = tls - smtpserver = smtp.gmail.com - smtpuser = yourname@gmail.com - smtpserverport = 587 + smtpEncryption = tls + smtpServer = smtp.gmail.com + smtpUser = yourname@gmail.com + smtpServerPort = 587 Once your commits are ready to be sent to the mailing list, run the following commands:
diff --git a/git-show.html b/git-show.html index 0c720cc..17bd829 100644 --- a/git-show.html +++ b/git-show.html
@@ -2106,8 +2106,8 @@ <p> Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line. - This overrides the <code>diff.orderfile</code> configuration variable - (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderfile</code>, + This overrides the <code>diff.orderFile</code> configuration variable + (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderFile</code>, use <code>-O/dev/null</code>. </p> </dd>
diff --git a/git-status.html b/git-status.html index ee17d83..83da38b 100644 --- a/git-status.html +++ b/git-status.html
@@ -866,7 +866,7 @@ only changes to the commits stored in the superproject are shown (this was the behavior before 1.7.0). Using "all" hides all changes to submodules (and suppresses the output of submodule summaries when the config option - <code>status.submodulesummary</code> is set). + <code>status.submoduleSummary</code> is set). </p> </dd> <dt class="hdlist1"> @@ -1047,7 +1047,7 @@ <div class="paragraph"><p>If the config variable <code>status.relativePaths</code> is set to false, then all paths shown are relative to the repository root, not to the current directory.</p></div> -<div class="paragraph"><p>If <code>status.submodulesummary</code> is set to a non zero number or true (identical +<div class="paragraph"><p>If <code>status.submoduleSummary</code> is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of <a href="git-submodule.html">git-submodule(1)</a>). Please note @@ -1075,7 +1075,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-10-24 15:27:52 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-status.txt b/git-status.txt index 4d8d530..b3319f7 100644 --- a/git-status.txt +++ b/git-status.txt
@@ -77,7 +77,7 @@ only changes to the commits stored in the superproject are shown (this was the behavior before 1.7.0). Using "all" hides all changes to submodules (and suppresses the output of submodule summaries when the config option - `status.submodulesummary` is set). + `status.submoduleSummary` is set). --ignored:: Show ignored files as well. @@ -207,7 +207,7 @@ paths shown are relative to the repository root, not to the current directory. -If `status.submodulesummary` is set to a non zero number or true (identical +If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note
diff --git a/git-tag.html b/git-tag.html index 22c59db..b515e04 100644 --- a/git-tag.html +++ b/git-tag.html
@@ -1007,7 +1007,7 @@ <div class="listingblock"> <div class="content"> <pre><code>[user] - signingkey = <gpg-key-id></code></pre> + signingKey = <gpg-key-id></code></pre> </div></div> </div> </div> @@ -1216,7 +1216,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-10-07 15:21:30 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git-tag.txt b/git-tag.txt index e953ba4..bfba4ef 100644 --- a/git-tag.txt +++ b/git-tag.txt
@@ -161,7 +161,7 @@ ------------------------------------- [user] - signingkey = <gpg-key-id> + signingKey = <gpg-key-id> -------------------------------------
diff --git a/git.html b/git.html index 06d541b..540840f 100644 --- a/git.html +++ b/git.html
@@ -2649,7 +2649,7 @@ If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument - and read the password from its STDOUT. See also the <em>core.askpass</em> + and read the password from its STDOUT. See also the <em>core.askPass</em> option in <a href="git-config.html">git-config(1)</a>. </p> </dd> @@ -2931,7 +2931,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-02-05 13:50:15 PST +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/git.txt b/git.txt index af30620..4749d1b 100644 --- a/git.txt +++ b/git.txt
@@ -43,9 +43,10 @@ branch of the `git.git` repository. Documentation for older releases are available here: -* link:v2.3.3/git.html[documentation for release 2.3.3] +* link:v2.3.4/git.html[documentation for release 2.3.4] * release notes for + link:RelNotes/2.3.4.txt[2.3.4], link:RelNotes/2.3.3.txt[2.3.3], link:RelNotes/2.3.2.txt[2.3.2], link:RelNotes/2.3.1.txt[2.3.1], @@ -919,7 +920,7 @@ If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument - and read the password from its STDOUT. See also the 'core.askpass' + and read the password from its STDOUT. See also the 'core.askPass' option in linkgit:git-config[1]. 'GIT_TERMINAL_PROMPT'::
diff --git a/gitattributes.html b/gitattributes.html index 9b6d331..ac1b3bd 100644 --- a/gitattributes.html +++ b/gitattributes.html
@@ -833,7 +833,7 @@ repositories (i.e., attributes of interest to all users) should go into <code>.gitattributes</code> files. Attributes that should affect all repositories for a single user should be placed in a file specified by the -<code>core.attributesfile</code> configuration option (see <a href="git-config.html">git-config(1)</a>). +<code>core.attributesFile</code> configuration option (see <a href="git-config.html">git-config(1)</a>). Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/attributes is used instead. Attributes for all users on a system should be placed in the @@ -1855,7 +1855,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-11-04 14:37:41 PST +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/gitattributes.txt b/gitattributes.txt index c892ffa..70899b3 100644 --- a/gitattributes.txt +++ b/gitattributes.txt
@@ -80,7 +80,7 @@ repositories (i.e., attributes of interest to all users) should go into `.gitattributes` files. Attributes that should affect all repositories for a single user should be placed in a file specified by the -`core.attributesfile` configuration option (see linkgit:git-config[1]). +`core.attributesFile` configuration option (see linkgit:git-config[1]). Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/attributes is used instead. Attributes for all users on a system should be placed in the
diff --git a/gitcredentials.html b/gitcredentials.html index 7eeede9..02b8f71 100644 --- a/gitcredentials.html +++ b/gitcredentials.html
@@ -780,7 +780,7 @@ </li> <li> <p> -Otherwise, if the <code>core.askpass</code> configuration variable is set, its +Otherwise, if the <code>core.askPass</code> configuration variable is set, its value is used as above. </p> </li> @@ -981,7 +981,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-20 08:40:27 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/gitcredentials.txt b/gitcredentials.txt index 47576be..1c75be0 100644 --- a/gitcredentials.txt +++ b/gitcredentials.txt
@@ -32,7 +32,7 @@ to the program on the command line, and the user's input is read from its standard output. -2. Otherwise, if the `core.askpass` configuration variable is set, its +2. Otherwise, if the `core.askPass` configuration variable is set, its value is used as above. 3. Otherwise, if the `SSH_ASKPASS` environment variable is set, its
diff --git a/gitignore.html b/gitignore.html index f493005..235677a 100644 --- a/gitignore.html +++ b/gitignore.html
@@ -789,7 +789,7 @@ <li> <p> Patterns read from the file specified by the configuration - variable <em>core.excludesfile</em>. + variable <em>core.excludesFile</em>. </p> </li> </ul></div> @@ -817,7 +817,7 @@ Patterns which a user wants Git to ignore in all situations (e.g., backup or temporary files generated by the user’s editor of choice) generally go into a file specified by - <code>core.excludesfile</code> in the user’s <code>~/.gitconfig</code>. Its default value is + <code>core.excludesFile</code> in the user’s <code>~/.gitconfig</code>. Its default value is $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore is used instead. </p> @@ -1019,7 +1019,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-12-22 14:47:31 PST +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/gitignore.txt b/gitignore.txt index 4fd0442..473623d 100644 --- a/gitignore.txt +++ b/gitignore.txt
@@ -38,7 +38,7 @@ * Patterns read from `$GIT_DIR/info/exclude`. * Patterns read from the file specified by the configuration - variable 'core.excludesfile'. + variable 'core.excludesFile'. Which file to place a pattern in depends on how the pattern is meant to be used. @@ -56,7 +56,7 @@ * Patterns which a user wants Git to ignore in all situations (e.g., backup or temporary files generated by the user's editor of choice) generally go into a file specified by - `core.excludesfile` in the user's `~/.gitconfig`. Its default value is + `core.excludesFile` in the user's `~/.gitconfig`. Its default value is $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore is used instead.
diff --git a/gitweb.conf.html b/gitweb.conf.html index 91c6536..e7f2cfc 100644 --- a/gitweb.conf.html +++ b/gitweb.conf.html
@@ -1656,7 +1656,7 @@ I/O. Enabled by default. </p> <div class="paragraph"><p>This feature can be configured on a per-repository basis via -repository’s <code>gitweb.showsizes</code> configuration variable (boolean).</p></div> +repository’s <code>gitweb.showSizes</code> configuration variable (boolean).</p></div> </dd> <dt class="hdlist1"> patches @@ -1996,7 +1996,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-06-06 12:15:38 PDT +Last updated 2015-03-23 14:31:16 PDT </div> </div> </body>
diff --git a/gitweb.conf.txt b/gitweb.conf.txt index ebe7a6c..0506f07 100644 --- a/gitweb.conf.txt +++ b/gitweb.conf.txt
@@ -706,7 +706,7 @@ I/O. Enabled by default. + This feature can be configured on a per-repository basis via -repository's `gitweb.showsizes` configuration variable (boolean). +repository's `gitweb.showSizes` configuration variable (boolean). patches:: Enable and configure "patches" view, which displays list of commits in email
diff --git a/merge-config.txt b/merge-config.txt index d78d6d8..8a0e52f 100644 --- a/merge-config.txt +++ b/merge-config.txt
@@ -1,4 +1,4 @@ -merge.conflictstyle:: +merge.conflictStyle:: Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is "merge", which shows a `<<<<<<<` conflict marker, changes made by one side,
diff --git a/user-manual.html b/user-manual.html index a671d01..100171b 100644 --- a/user-manual.html +++ b/user-manual.html
@@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User Manual</title><link rel="stylesheet" type="text/css" href="docbook-xsl.css"><meta name="generator" content="DocBook XSL Stylesheets V1.78.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="article"><div class="titlepage"><div><div><h2 class="title"><a name="idp55121616"></a>Git User Manual</h2></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="section"><a href="#repositories-and-branches">Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a Git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="section"><a href="#exploring-git-history">Exploring Git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt></dl></dd><dt><span class="section"><a href="#Developing-With-git">Developing with Git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling Git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development">Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public Git repositories</a></span></dt><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt></dl></dd><dt><span class="section"><a href="#cleaning-up-history">Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#interactive-rebase">Using interactive rebases</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="section"><a href="#advanced-branch-management">Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote-tracking branches</a></span></dt></dl></dd><dt><span class="section"><a href="#git-concepts">Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="section"><a href="#submodules">Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="section"><a href="#low-level-operations">Low-level Git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="section"><a href="#hacking-git">Hacking Git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git’s source code</a></span></dt></dl></dd><dt><span class="section"><a href="#glossary">Git Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User Manual</title><link rel="stylesheet" type="text/css" href="docbook-xsl.css"><meta name="generator" content="DocBook XSL Stylesheets V1.78.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="article"><div class="titlepage"><div><div><h2 class="title"><a name="idp50296176"></a>Git User Manual</h2></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="section"><a href="#repositories-and-branches">Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a Git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="section"><a href="#exploring-git-history">Exploring Git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt></dl></dd><dt><span class="section"><a href="#Developing-With-git">Developing with Git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling Git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development">Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public Git repositories</a></span></dt><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt></dl></dd><dt><span class="section"><a href="#cleaning-up-history">Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#interactive-rebase">Using interactive rebases</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="section"><a href="#advanced-branch-management">Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote-tracking branches</a></span></dt></dl></dd><dt><span class="section"><a href="#git-concepts">Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="section"><a href="#submodules">Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="section"><a href="#low-level-operations">Low-level Git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="section"><a href="#hacking-git">Hacking Git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git’s source code</a></span></dt></dl></dd><dt><span class="section"><a href="#glossary">Git Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of Git.</p><p><a class="xref" href="#repositories-and-branches" title="Repositories and Branches">the section called “Repositories and Branches”</a> and <a class="xref" href="#exploring-git-history" title="Exploring Git history">the section called “Exploring Git history”</a> explain how to fetch and study a project using git—read these chapters to learn how to build and test a particular version of a software project, search for @@ -492,7 +492,7 @@ for other users who clone your repository.</p><p>If you wish the exclude patterns to affect only certain repositories (instead of every repository for a given project), you may instead put them in a file in your repository named <code class="literal">.git/info/exclude</code>, or in any -file specified by the <code class="literal">core.excludesfile</code> configuration variable. +file specified by the <code class="literal">core.excludesFile</code> configuration variable. Some Git commands can also take exclude patterns directly on the command line. See <a class="ulink" href="gitignore.html" target="_top">gitignore(5)</a> for the details.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a name="how-to-merge"></a>How to merge</h3></div></div></div><p>You can rejoin two diverging branches of development using <a class="ulink" href="git-merge.html" target="_top">git-merge(1)</a>:</p><pre class="literallayout">$ git merge branchname</pre><p>merges the development in the branch <code class="literal">branchname</code> into the current
diff --git a/user-manual.txt b/user-manual.txt index 7330d88..68978f5 100644 --- a/user-manual.txt +++ b/user-manual.txt
@@ -1200,7 +1200,7 @@ If you wish the exclude patterns to affect only certain repositories (instead of every repository for a given project), you may instead put them in a file in your repository named `.git/info/exclude`, or in any -file specified by the `core.excludesfile` configuration variable. +file specified by the `core.excludesFile` configuration variable. Some Git commands can also take exclude patterns directly on the command line. See linkgit:gitignore[5] for the details.
